summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mysql-test/mysql-test-run.sh20
-rw-r--r--mysql-test/t/disabled.def20
2 files changed, 34 insertions, 6 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index afed2e2ac84..b69bac1ad0b 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -1506,12 +1506,6 @@ run_testcase ()
if [ -n "$RESULT_EXT" -a \( x$RECORD = x1 -o -f "$result_file$RESULT_EXT" \) ] ; then
result_file="$result_file$RESULT_EXT"
fi
- if [ -f "$TESTDIR/$tname.disabled" ]
- then
- comment=`$CAT $TESTDIR/$tname.disabled`;
- disable_test $tname "$comment"
- return
- fi
if [ "$USE_MANAGER" = 1 ] ; then
many_slaves=`$EXPR \( \( $tname : rpl_failsafe \) != 0 \) \| \( \( $tname : rpl_chain_temp_table \) != 0 \)`
fi
@@ -1541,6 +1535,20 @@ run_testcase ()
return
fi
+ if [ -f "$TESTDIR/$tname.disabled" ]
+ then
+ comment=`$CAT $TESTDIR/$tname.disabled`;
+ disable_test $tname "$comment"
+ return
+ fi
+ comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`;
+ if [ -n "$comment" ]
+ then
+ comment=`echo $comment | sed 's/^[^:]*: *//'`
+ disable_test $tname "$comment"
+ return
+ fi
+
if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then
# Stop all slave threads, so that we don't have useless reconnection
# attempts and error messages in case the slave and master servers restart.
diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def
new file mode 100644
index 00000000000..d2ab8158c51
--- /dev/null
+++ b/mysql-test/t/disabled.def
@@ -0,0 +1,20 @@
+##############################################################################
+#
+# List the test cases that are to be disabled temporarely.
+#
+# Separate the test case name and the comment with ':'.
+#
+# <testcasename> : Comment test
+#
+# Don't use any TAB characters for whitespace.
+#
+##############################################################################
+
+ndb_alter_table : NDB team needs to fix
+ndb_autodiscover : NDB team needs to fix
+ndb_autodiscover2 : NDB team needs to fix
+ndb_cache_multi : NDB team needs to fix
+ndb_cache_multi2 : NDB team needs to fix
+ndb_multi : NDB team needs to fix
+ndb_restore : NDB team needs to fix
+