# HG changeset patch # User root@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # Node ID 586c3a2103950e247a04d049d3dec7a34b705d47 # Parent 00aba64e034e70a262cbe3b729b3601ce8142eda HG Patch to correct inconsistent reporting from xm-test. Signed-off-by: Woody Marvel diff -r 00aba64e034e -r 586c3a210395 tools/xm-test/runtest.sh --- a/tools/xm-test/runtest.sh Thu Mar 16 11:31:16 2006 +++ b/tools/xm-test/runtest.sh Fri Mar 17 04:17:48 2006 @@ -19,10 +19,12 @@ # Just submit the report submit_report() { - reportfile=$1 - - ./lib/XmTestReport/Report.py $reportfile + if [ "$GROUPENTERED" = "default" ];then + ./lib/XmTestReport/Report.py $reportfile + else + echo "No report submitted for $REPORT, requires a default group run." + fi } # Generate XML result report from output file @@ -40,6 +42,7 @@ make_environment_report() { os=$1 prog=$2 + rm -f $REPORT"*" > /dev/null 2>&1 if ! ./lib/XmTestReport/OSReport.py > $os; then echo "Unable to generate clean OSReport" echo "Take a look at $os" @@ -131,7 +134,6 @@ run_tests() { groupentered=$1 output=$2 - exec < grouptest/$groupentered while read casename testlist; do echo Running $casename tests... @@ -143,7 +145,6 @@ echo "*** Running tests $testlist from case $casename" >> $output (cd tests/$casename && TEST_VERBOSE=1 make -k check TESTS="$testlist") >> $output 2>&1 fi - done } @@ -272,7 +273,6 @@ make_result_report $OUTPUT $RESULTREPORTTEMP cat $OSREPORTTEMP $PROGREPORTTEMP $RESULTREPORTTEMP > $XMLREPORT rm $OSREPORTTEMP $PROGREPORTTEMP $RESULTREPORTTEMP - fi if [ "$report" = "yes" ]; then @@ -280,5 +280,5 @@ echo "No such file: $XMLREPORT" exit 1 fi - submit_report $XMLREPORT -fi + submit_report $XMLREPORT +fi