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

Fix CORALCOOL-2883 also in qmtest


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19980 4525493e-7705-40b1-a816-d608a930855b
parent 9ef36d07
......@@ -209,9 +209,10 @@ theQmr=${theQmrDir}/${BINARY_TAG}.qmr # Drop "-cmake" (CORALCOOL-2842)
echo "Launch tests - results will be in ${theQmr}"
echo Launch \'qmtest run ${theTests}\'
qmtestRun="qmtest run"
if [ `${ccrun} python -c 'import platform; print platform.system()'` == "Darwin" ]; then qmtestRun="python `${ccrun} which qmtest` run"; fi # CORALCOOL-2884
qmtestSum="qmtest summarize"
if [ `${ccrun} python -c 'import platform; print platform.system()'` == "Darwin" ]; then qmtestRun="python `${ccrun} which qmtest` run"; qmtestSum="python `${ccrun} which qmtest` summarize"; fi # CORALCOOL-2884 and CORALCOOL-2883
${ccrun} -q VALGRIND_LIB=$VALGRIND_LIB CORAL_TESTSUITE_VALGRIND_SUPP=$CORAL_TESTSUITE_VALGRIND_SUPP CORAL_TESTSUITE_VALGRIND_LOGDIR=$CORAL_TESTSUITE_VALGRIND_LOGDIR ${qmtestRun} -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}'
${ccrun} -q ${qmtestSum} -f stats ${theQmr} ${theTests} | awk 'BEGIN{out=0}{if ($2=="STATISTICS") out=1; if (out==1) print}'
# Beautify and move the valgrind logs
if [ "$CORAL_TESTSUITE_VALGRIND" == "1" ]; then
......
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