Commit 0f4bb613 authored by unknown's avatar unknown

Have 'mysql-test-run' write a list of all failed tests at the end, if run with '--force'.


mysql-test/mysql-test-run.sh:
  Backport an improvement from 4.1: If the tool is run with '--force', give a list of all test cases that failed at the end.
  This is essential for automated analysis of the build logs file.
parent e1dade19
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
# Sligtly updated by Monty # Sligtly updated by Monty
# Cleaned up again by Matt # Cleaned up again by Matt
# Fixed by Sergei # Fixed by Sergei
# List of failed cases (--force) backported from 4.1 by Joerg
# :-) # :-)
#++ #++
...@@ -202,6 +203,7 @@ MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log ...@@ -202,6 +203,7 @@ MYSQL_MANAGER_LOG=$MYSQL_TEST_DIR/var/log/manager.log
MYSQL_MANAGER_USER=root MYSQL_MANAGER_USER=root
NO_SLAVE=0 NO_SLAVE=0
USER_TEST= USER_TEST=
FAILED_CASES=
EXTRA_MASTER_OPT="" EXTRA_MASTER_OPT=""
EXTRA_MYSQL_TEST_OPT="" EXTRA_MYSQL_TEST_OPT=""
...@@ -1333,7 +1335,7 @@ run_testcase () ...@@ -1333,7 +1335,7 @@ run_testcase ()
show_failed_diff $result_file show_failed_diff $result_file
$ECHO $ECHO
if [ x$FORCE != x1 ] ; then if [ x$FORCE != x1 ] ; then
$ECHO "Aborting. To continue, re-run with '--force'." $ECHO "Aborting: $tname failed. To continue, re-run with '--force'."
$ECHO $ECHO
if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ] if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ]
then then
...@@ -1342,7 +1344,7 @@ run_testcase () ...@@ -1342,7 +1344,7 @@ run_testcase ()
fi fi
exit 1 exit 1
fi fi
FAILED_CASES="$FAILED_CASES $tname"
if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ] if [ -z "$DO_GDB" ] && [ -z "$USE_RUNNING_SERVER" ] && [ -z "$DO_DDD" ]
then then
mysql_restart mysql_restart
...@@ -1485,4 +1487,10 @@ $ECHO ...@@ -1485,4 +1487,10 @@ $ECHO
[ "$DO_GCOV" ] && gcov_collect # collect coverage information [ "$DO_GCOV" ] && gcov_collect # collect coverage information
[ "$DO_GPROF" ] && gprof_collect # collect coverage information [ "$DO_GPROF" ] && gprof_collect # collect coverage information
exit 0 if [ $TOT_FAIL -ne 0 ]; then
$ECHO "mysql-test-run: *** Failing the test(s):$FAILED_CASES"
$ECHO
exit 1
else
exit 0
fi
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