Commit 40c0132d authored by Marco Clemencic's avatar Marco Clemencic
Browse files

run_qmtest and CTestXML2HTML resilient to configuration mistakes

parent f751eddf
...@@ -2,6 +2,9 @@ package GaudiPolicy ...@@ -2,6 +2,9 @@ package GaudiPolicy
package manager: Marco Clemencic package manager: Marco Clemencic
Commit Id: $Format:%H$ Commit Id: $Format:%H$
! 2014-08-29 - Marco Clemencic
- Made run_qmtest and CTestXML2HTML more resilient to configuration mistakes.
! 2014-08-28 - Marco Clemencic ! 2014-08-28 - Marco Clemencic
- Minor fixes to GaudiTest.py and CTestXML2HTML. - Minor fixes to GaudiTest.py and CTestXML2HTML.
......
...@@ -535,6 +535,11 @@ def main(): ...@@ -535,6 +535,11 @@ def main():
for site in sites : for site in sites :
#print " -> Process the site : "+site.get("BuildStamp") #print " -> Process the site : "+site.get("BuildStamp")
Testing = site.find("Testing") Testing = site.find("Testing")
tests = Testing.findall('Test')
if not tests:
# no tests in this "site", let's ignore it
continue
#create a directory containing the html file for each site #create a directory containing the html file for each site
outputTemp = output #os.path.join(output,os.path.split(fileName)[1][:-8]+str(site.get("BuildStamp"))) outputTemp = output #os.path.join(output,os.path.split(fileName)[1][:-8]+str(site.get("BuildStamp")))
if not os.path.isdir(outputTemp) : if not os.path.isdir(outputTemp) :
......
...@@ -77,6 +77,13 @@ def main(argv = None): ...@@ -77,6 +77,13 @@ def main(argv = None):
print "==========> Running tests for package %s" % opts.package print "==========> Running tests for package %s" % opts.package
if not os.path.isdir(opts.qmtest_dir):
print "==========> No test directory, exiting"
return
print "==========> Entering '%s'" % opts.qmtest_dir
os.chdir(opts.qmtest_dir)
# create the destination directory if necessary # create the destination directory if necessary
if opts.output: if opts.output:
results_dest_dir = os.path.realpath(os.path.join(opts.qmtest_dir, os.path.dirname(opts.output))) results_dest_dir = os.path.realpath(os.path.join(opts.qmtest_dir, os.path.dirname(opts.output)))
...@@ -84,9 +91,6 @@ def main(argv = None): ...@@ -84,9 +91,6 @@ def main(argv = None):
print "==========> Creating '%s'" % results_dest_dir print "==========> Creating '%s'" % results_dest_dir
os.makedirs(results_dest_dir, 0755) os.makedirs(results_dest_dir, 0755)
print "==========> Entering '%s'" % opts.qmtest_dir
os.chdir(opts.qmtest_dir)
qmtest_cmd = ["qmtest"] qmtest_cmd = ["qmtest"]
if not os.path.isdir("QMTest"): if not os.path.isdir("QMTest"):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment