Fixed incorrect default argument.
BUG= TEST= Review URL: https://webrtc-codereview.appspot.com/391009 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1677 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -24,6 +24,8 @@ 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"
|
||||||
|
|
||||||
# Copied from Chromium's
|
# Copied from Chromium's
|
||||||
# trunk/tools/build/scripts/master/factory/chromium_factory.py
|
# 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
|
||||||
@@ -61,7 +63,7 @@ class WebRTCFactory(factory.BuildFactory):
|
|||||||
def __init__(self, build_factory_properties=None, steps=None,
|
def __init__(self, build_factory_properties=None, steps=None,
|
||||||
enable_coverage=False, enable_valgrind=False,
|
enable_coverage=False, enable_valgrind=False,
|
||||||
account='webrtc-cb', coverage_url=None,
|
account='webrtc-cb', coverage_url=None,
|
||||||
coverage_dir="/var/www"):
|
coverage_dir=DEFAULT_COVERAGE_DIR):
|
||||||
factory.BuildFactory.__init__(self, steps)
|
factory.BuildFactory.__init__(self, steps)
|
||||||
self.properties = properties.Properties()
|
self.properties = properties.Properties()
|
||||||
self.enable_build = False
|
self.enable_build = False
|
||||||
@@ -157,7 +159,7 @@ class GenerateCodeCoverage(ShellCommand):
|
|||||||
self.setDefaultWorkdir("build/trunk")
|
self.setDefaultWorkdir("build/trunk")
|
||||||
self.coverage_url = coverage_url
|
self.coverage_url = coverage_url
|
||||||
self.coverage_dir = coverage_dir
|
self.coverage_dir = coverage_dir
|
||||||
self.description = "Coverage Report"
|
self.description = ["Coverage Report"]
|
||||||
self.setCommand(["./tools/continuous_build/generate_coverage_html.sh",
|
self.setCommand(["./tools/continuous_build/generate_coverage_html.sh",
|
||||||
"final.info",
|
"final.info",
|
||||||
WithProperties(coverage_dir + "/%(buildername)s_%(buildnumber)s")])
|
WithProperties(coverage_dir + "/%(buildername)s_%(buildnumber)s")])
|
||||||
@@ -236,7 +238,7 @@ class WebRTCLinuxFactory(WebRTCFactory):
|
|||||||
|
|
||||||
def __init__(self, build_factory_properties=None, steps=None,
|
def __init__(self, build_factory_properties=None, steps=None,
|
||||||
enable_coverage=False, enable_valgrind=False, account=None,
|
enable_coverage=False, enable_valgrind=False, account=None,
|
||||||
coverage_url=None, coverage_dir=None):
|
coverage_url=None, coverage_dir=DEFAULT_COVERAGE_DIR):
|
||||||
WebRTCFactory.__init__(self, build_factory_properties, steps,
|
WebRTCFactory.__init__(self, build_factory_properties, steps,
|
||||||
enable_coverage, enable_valgrind, account,
|
enable_coverage, enable_valgrind, account,
|
||||||
coverage_url, coverage_dir)
|
coverage_url, coverage_dir)
|
||||||
|
Reference in New Issue
Block a user