Commit eb0cea3a authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Fix integration of vlagrind log dirs (as in CORAL)


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19651 4525493e-7705-40b1-a816-d608a930855b
parent e0716f5b
......@@ -353,14 +353,17 @@ class StandardTest(ShellCommandTest):
# Add as additional valgrind suppression file from ROOT
###valgrindSupp += ' --suppressions=' + os.path.abspath( os.environ['ROOTSYS'] + '/etc/valgrind-root.supp' )
# Define the path for the output valgrind log
valgrindLog = '../../logs/qmtest/valgrind/'
if 'CORAL_TESTSUITE_VALGRIND_LOGDIR' in os.environ:
valgrindLog = os.environ['CORAL_TESTSUITE_VALGRIND_LOGDIR']
else:
valgrindLog = '../../logs/qmtestCoral/valgrind' # Old default
# Option 1 - allow a single platform for valgrind tests
###if os.environ['CMTCONFIG'] != 'x86_64-slc5-gcc43-dbg':
### result.SetOutcome(result.UNTESTED)
### result[result.CAUSE] = 'Use another platform for valgrind.'
### return
# Option 2 - use a different log directory per platform
valgrindLog = valgrindLog+os.environ['CMTCONFIG']
valgrindLog = valgrindLog+'/'+os.environ['CMTCONFIG']
valgrindLog = os.path.abspath( valgrindLog )
try: os.mkdir( valgrindLog )
except OSError: pass
......
......@@ -185,6 +185,7 @@ if [ "$CORAL_TESTSUITE_VALGRIND" == "1" ]; then
echo "ERROR! Suppression file not found: ${CORAL_TESTSUITE_VALGRIND_SUPP}"
exit 1
fi
CORAL_TESTSUITE_VALGRIND_LOGDIR=${theQmrDir}/valgrind # No trailing '/'
fi
# Run the tests from the qmtest directory
......@@ -198,7 +199,7 @@ fi
theQmr=${theQmrDir}/${BINARY_TAG}-cmake.qmr # TEMPORARY
echo "Launch tests - results will be in ${theQmr}"
echo Launch \'qmtest run ${theTests}\'
${ccrun} -q VALGRIND_LIB=$VALGRIND_LIB CORAL_TESTSUITE_VALGRIND_SUPP=$CORAL_TESTSUITE_VALGRIND_SUPP qmtest run -o ${theQmr} ${theTests} > /dev/null
${ccrun} -q VALGRIND_LIB=$VALGRIND_LIB CORAL_TESTSUITE_VALGRIND_SUPP=$CORAL_TESTSUITE_VALGRIND_SUPP CORAL_TESTSUITE_VALGRIND_LOGDIR=$CORAL_TESTSUITE_VALGRIND_LOGDIR qmtest run -o ${theQmr} ${theTests} > /dev/null # NB Extra env are needed (and more explicit than "export")!
${ccrun} -q qmtest summarize -f stats ${theQmr} ${theTests} | awk 'BEGIN{out=0}{if ($2=="STATISTICS") out=1; if (out==1) print}'
# Beautify and move the valgrind logs
......
Markdown is supported
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