From 6f5f9ffb30d486e1bc1e55db578dcfbae7b360d4 Mon Sep 17 00:00:00 2001 From: "phoglund@webrtc.org" Date: Thu, 16 Feb 2012 14:04:14 +0000 Subject: [PATCH] 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 --- tools/continuous_build/master.cfg | 4 ++-- tools/continuous_build/webrtc_buildbot/utils.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/continuous_build/master.cfg b/tools/continuous_build/master.cfg index efbb00f07..04aca005f 100755 --- a/tools/continuous_build/master.cfg +++ b/tools/continuous_build/master.cfg @@ -190,13 +190,13 @@ linux_factory_64_release.EnableTests(linux_normal_tests) linux_factory_32_dbg = utils.WebRTCLinuxFactory() 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.EnableTests(linux_normal_tests) linux_factory_video = utils.WebRTCLinuxFactory() 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.EnableTests(linux_physical_machine_tests) diff --git a/tools/continuous_build/webrtc_buildbot/utils.py b/tools/continuous_build/webrtc_buildbot/utils.py index a50629e78..852c9a31f 100755 --- a/tools/continuous_build/webrtc_buildbot/utils.py +++ b/tools/continuous_build/webrtc_buildbot/utils.py @@ -25,7 +25,7 @@ SUPPORTED_PLATFORMS = ('Linux', 'Mac', 'Windows') SVN_LOCATION = 'http://webrtc.googlecode.com/svn/trunk' 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 # 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 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 - root) corresponding to the web server URL. That is, if we write Foo to - the coverage directory we expect that directory to be reachable from - url/Foo. + expect that the coverage directory is somewhere under the web server root + (i.e. public html root) that corresponds to the web server URL. That is, if + we write Foo to the coverage directory we expect that directory to be + reachable from url/Foo. """ def __init__(self, coverage_url, coverage_dir, coverage_file, **kwargs):