generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed normal LCOV case

Browse Source 
BUG=None
TEST=Tested on local master, with and without a test failure.

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2095 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
kjellander@webrtc.org 2012-04-23 15:42:56 +00:00
parent ddab60be56
commit f3794f8e5a
2 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/.gitignore vendored
View File

@ -37,6 +37,7 @@ twistd.pid
/continuous_build/build_internal/masters/master.webrtc/android-ndk /continuous_build/build_internal/masters/master.webrtc/android-ndk
/continuous_build/build_internal/masters/master.webrtc/chromeos /continuous_build/build_internal/masters/master.webrtc/chromeos
/continuous_build/build_internal/masters/master.webrtc/linux-chrome /continuous_build/build_internal/masters/master.webrtc/linux-chrome
/continuous_build/build_internal/masters/master.webrtc/linux-chrome-bloat
/continuous_build/build_internal/masters/master.webrtc/linux-clang /continuous_build/build_internal/masters/master.webrtc/linux-clang
/continuous_build/build_internal/masters/master.webrtc/linux-slave-1 /continuous_build/build_internal/masters/master.webrtc/linux-slave-1
/continuous_build/build_internal/masters/master.webrtc/linux-slave-2 /continuous_build/build_internal/masters/master.webrtc/linux-slave-2

31
tools/continuous_build/build_internal/scripts/webrtc_buildbot/utils.py
View File

@ -419,35 +419,30 @@ class GenerateCodeCoverage(ShellCommand):
""" """
ShellCommand.__init__(self, **kwargs) ShellCommand.__init__(self, **kwargs)
self.addFactoryArguments(build_status_oracle=build_status_oracle, self.addFactoryArguments(build_status_oracle=build_status_oracle,
coverage_url=coverage_url, coverage_url=coverage_url)
coverage_dir=coverage_dir,
coverage_file=coverage_file)
self.build_status_oracle = build_status_oracle self.build_status_oracle = build_status_oracle
self.coverage_url = coverage_url self.coverage_url = coverage_url
self.coverage_dir = coverage_dir
self.coverage_file = coverage_file
self.description = ['Coverage Report'] self.description = ['Coverage Report']
self.name = 'LCOV (Report)' self.name = 'LCOV (Report)'
self.warnOnFailure = True self.warnOnFailure = True
self.flunkOnFailure = False self.flunkOnFailure = False
output_dir = os.path.join(coverage_dir,
'%(buildername)s_%(buildnumber)s')
generate_script = PosixPathJoin('tools', 'continuous_build',
'build_internal', 'scripts',
'generate_coverage_html.sh')
self.setCommand([generate_script, coverage_file,
WithProperties(output_dir)])
def createSummary(self, log): def createSummary(self, log):
if self.build_status_oracle.LastBuildSucceeded(): if self.build_status_oracle.LastBuildSucceeded():
coverage_url = urlparse.urljoin(self.coverage_url, '%s_%s' output_url = urlparse.urljoin(self.coverage_url, '%s_%s'
% (self.getProperty('buildername'), % (self.getProperty('buildername'),
self.getProperty('buildnumber'))) self.getProperty('buildnumber')))
self.addURL('click here', coverage_url) self.addURL('click here', output_url)
def start(self): def start(self):
if self.build_status_oracle.LastBuildSucceeded(): if not self.build_status_oracle.LastBuildSucceeded():
output_dir = os.path.join(self.coverage_dir,
'%(buildername)s_%(buildnumber)s')
generate_script = PosixPathJoin('tools', 'continuous_build',
'build_internal', 'scripts',
'generate_coverage_html.sh')
self.setCommand([generate_script, self.coverage_file,
WithProperties(output_dir)])
else:
self.description = ['Step skipped due to test failure.'] self.description = ['Step skipped due to test failure.']
self.setCommand(['false']) # Dummy command that fails. self.setCommand(['false']) # Dummy command that fails.
ShellCommand.start(self) ShellCommand.start(self)