From e7e29543ddd6df23faa6e0630e963320eedf4e40 Mon Sep 17 00:00:00 2001
From: madiot <madiot@localhost>
Date: Wed, 27 Jan 2010 09:14:32 +0000
Subject: [PATCH] fix related to code coverage with EMMA - serialize the startDS in the tools function startservers to avoid emma.properties generated file to overwrite each other - skip the kill on OpenDS processes to avoid potential unexpected behaviour with code coverage - generating a new Emma coverage.ec statistics file for each start of any given OpenDS instance
---
opends/tests/staf-tests/shared/functions/topology.xml | 26 --------------------------
1 files changed, 0 insertions(+), 26 deletions(-)
diff --git a/opends/tests/staf-tests/shared/functions/topology.xml b/opends/tests/staf-tests/shared/functions/topology.xml
index c79d82e..2155274 100755
--- a/opends/tests/staf-tests/shared/functions/topology.xml
+++ b/opends/tests/staf-tests/shared/functions/topology.xml
@@ -782,32 +782,6 @@
</else>
</if>
- <!-- configure the coverage dump file -->
- <script>
- mylog="::coverage - checking for %s/%s/lib/emma.jar\n" % (dsDir,OPENDSNAME)
- if os.path.exists(os.path.join(dsDir,OPENDSNAME,'lib','emma.jar')):
- mylog+=" ::coverage on\n"
- coveragePath = os.path.join(LOGS_ROOT,'coverage')
- if not os.path.exists(coveragePath):
- os.mkdir(coveragePath)
- mylog+=" ::mkdir %s on\n" % coveragePath
- # copying coverage.em in coveragePath
- import shutil
- shutil.copy(os.path.join(dsDir,OPENDSNAME,'coverage.em'),coveragePath)
- coverageGroupPath=os.path.join(coveragePath,CurrentTestPath['group'])
- if not os.path.exists(coverageGroupPath):
- os.mkdir(coverageGroupPath)
- mylog+=" ::mkdir %s on\n" % (coverageGroupPath)
- mylog+=" ::writing to %s/%s/classes/emma.properties" % (dsDir,OPENDSNAME)
- existingECs=[cf for cf in os.listdir(coverageGroupPath) if cf.startswith('coverage') and cf.endswith('.ec')]
- newCoverageEC=os.path.join(coverageGroupPath,'coverage%s.ec' % len(existingECs))
- coveragefh = open( '%s/%s/classes/emma.properties' % (dsDir,OPENDSNAME), 'w' )
- coveragefh.write( 'coverage.out.file=%s\n' % (newCoverageEC) )
- coveragefh.write( 'verbosity.level=silent\n')
- coveragefh.write( 'coverage.out.merge=true\n')
- coveragefh.close()
- </script>
- <message>mylog</message>
<!--- Set up DS -->
<message>
'Set up DS on %s : %s/%s' % (dsHost,dsDir,OPENDSNAME)
--
Gitblit v1.10.0