scripts/oe-selftest: avoid the creation of coverage file when coverage not installed

Coverage subprocessing file is being created even when coverage
is not installed, which causes errors of "module not found" to
be send to the oe-selftest output.

This patch adds indent to the block of code creating this coverage
file, so it can only be executed when coverage is actually
installed.

[Yocto #9334]

(From OE-Core rev: 03d1711350895e941a476bd2d2a6cd389be07509)

Signed-off-by: Humberto Ibarra <humberto.ibarra.lopez@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Humberto Ibarra 2016-04-05 22:15:54 -05:00 committed by Richard Purdie
parent 6e5e225217
commit d8f1f428bd
1 changed files with 13 additions and 13 deletions

View File

@ -584,20 +584,20 @@ def buildResultClass(args):
if self.coverage_installed: if self.coverage_installed:
log.info("Coverage is enabled") log.info("Coverage is enabled")
# In case the user has not set the variable COVERAGE_PROCESS_START, # In case the user has not set the variable COVERAGE_PROCESS_START,
# create a default one and export it. The COVERAGE_PROCESS_START # create a default one and export it. The COVERAGE_PROCESS_START
# value indicates where the coverage configuration file resides # value indicates where the coverage configuration file resides
# More info on https://pypi.python.org/pypi/coverage # More info on https://pypi.python.org/pypi/coverage
if not os.environ.get('COVERAGE_PROCESS_START'): if not os.environ.get('COVERAGE_PROCESS_START'):
os.environ['COVERAGE_PROCESS_START'] = coverage_setup(args.coverage_source, args.coverage_include, args.coverage_omit) os.environ['COVERAGE_PROCESS_START'] = coverage_setup(args.coverage_source, args.coverage_include, args.coverage_omit)
# Use default site.USER_SITE and write corresponding config file # Use default site.USER_SITE and write corresponding config file
site.ENABLE_USER_SITE = True site.ENABLE_USER_SITE = True
if not os.path.exists(site.USER_SITE): if not os.path.exists(site.USER_SITE):
os.makedirs(site.USER_SITE) os.makedirs(site.USER_SITE)
self.coveragepth = os.path.join(site.USER_SITE, "coverage.pth") self.coveragepth = os.path.join(site.USER_SITE, "coverage.pth")
with open(self.coveragepth, 'w') as cps: with open(self.coveragepth, 'w') as cps:
cps.write('import sys,site; sys.path.extend(site.getsitepackages()); import coverage; coverage.process_startup();') cps.write('import sys,site; sys.path.extend(site.getsitepackages()); import coverage; coverage.process_startup();')
def stopTestRun(self): def stopTestRun(self):
""" Report coverage data after the testcases are run """ """ Report coverage data after the testcases are run """