Moved coverage directory since we have to symlink the coverage folder from /var/www.

BUG=
TEST=

Review URL: https://webrtc-codereview.appspot.com/397006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1703 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
phoglund@webrtc.org 2012-02-16 14:04:14 +00:00
parent 590e5eb283
commit 6f5f9ffb30
2 changed files with 7 additions and 7 deletions
tools/continuous_build
master.cfg
webrtc_buildbot

@ -190,13 +190,13 @@ linux_factory_64_release.EnableTests(linux_normal_tests)
linux_factory_32_dbg = utils.WebRTCLinuxFactory() linux_factory_32_dbg = utils.WebRTCLinuxFactory()
linux_factory_32_dbg.EnableCoverage( linux_factory_32_dbg.EnableCoverage(
coverage_url='http://webrtc-cb-linux-slave-4.cbf.corp.google.com/') coverage_url='http://webrtc-cb-linux-slave-4.cbf.corp.google.com/coverage/')
linux_factory_32_dbg.EnableBuild(build32=True) linux_factory_32_dbg.EnableBuild(build32=True)
linux_factory_32_dbg.EnableTests(linux_normal_tests) linux_factory_32_dbg.EnableTests(linux_normal_tests)
linux_factory_video = utils.WebRTCLinuxFactory() linux_factory_video = utils.WebRTCLinuxFactory()
linux_factory_video.EnableCoverage( linux_factory_video.EnableCoverage(
coverage_url='http://webrtc-build-bot-se.lul/') coverage_url='http://webrtc-build-bot-se.lul/coverage/')
linux_factory_video.EnableBuild() linux_factory_video.EnableBuild()
linux_factory_video.EnableTests(linux_physical_machine_tests) linux_factory_video.EnableTests(linux_physical_machine_tests)

@ -25,7 +25,7 @@ SUPPORTED_PLATFORMS = ('Linux', 'Mac', 'Windows')
SVN_LOCATION = 'http://webrtc.googlecode.com/svn/trunk' SVN_LOCATION = 'http://webrtc.googlecode.com/svn/trunk'
VALGRIND_CMD = ['tools/valgrind-webrtc/webrtc_tests.sh', '-t', 'cmdline'] VALGRIND_CMD = ['tools/valgrind-webrtc/webrtc_tests.sh', '-t', 'cmdline']
DEFAULT_COVERAGE_DIR = '/var/www/' DEFAULT_COVERAGE_DIR = '/var/www/coverage/'
# Copied from trunk/tools/build/scripts/master/factory/chromium_factory.py # Copied from trunk/tools/build/scripts/master/factory/chromium_factory.py
# but converted to a list since we set defines instead of using an environment # but converted to a list since we set defines instead of using an environment
@ -181,10 +181,10 @@ class GenerateCodeCoverage(ShellCommand):
The command will dump the HTML output into coverage_dir, in a directory The command will dump the HTML output into coverage_dir, in a directory
whose name is generated from the build number and slave name. We will whose name is generated from the build number and slave name. We will
expect that the coverage directory is the web server root (i.e. public html expect that the coverage directory is somewhere under the web server root
root) corresponding to the web server URL. That is, if we write Foo to (i.e. public html root) that corresponds to the web server URL. That is, if
the coverage directory we expect that directory to be reachable from we write Foo to the coverage directory we expect that directory to be
url/Foo. reachable from url/Foo.
""" """
def __init__(self, coverage_url, coverage_dir, coverage_file, **kwargs): def __init__(self, coverage_url, coverage_dir, coverage_file, **kwargs):