diff options
| author | kent@mysql.com <> | 2005-03-16 09:23:38 +0100 |
|---|---|---|
| committer | kent@mysql.com <> | 2005-03-16 09:23:38 +0100 |
| commit | 72e2466c0d33961852537bad8aa38d2f4a5b3ae2 (patch) | |
| tree | 676efbd59568ce61656c2c488ac9df1dfc608c9a | |
| parent | 19a82124a2d8c86166dd337bc21f2a0d6f95cfeb (diff) | |
| download | mariadb-git-72e2466c0d33961852537bad8aa38d2f4a5b3ae2.tar.gz | |
mysql-test-run.sh:
Check that there is a disabled.def before using it
disabled.def:
Reenable ndb tests accidently disabled
| -rw-r--r-- | mysql-test/mysql-test-run.sh | 14 | ||||
| -rw-r--r-- | mysql-test/t/disabled.def | 8 |
2 files changed, 8 insertions, 14 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index b69bac1ad0b..4e970ca034d 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -1541,12 +1541,14 @@ run_testcase () 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 + if [ -f "$TESTDIR/disabled.def" ] ; then + comment=`$GREP "^$tname *: *" $TESTDIR/disabled.def`; + if [ -n "$comment" ] + then + comment=`echo $comment | sed 's/^[^:]*: *//'` + disable_test $tname "$comment" + return + fi fi if [ "x$USE_EMBEDDED_SERVER" != "x1" ] ; then diff --git a/mysql-test/t/disabled.def b/mysql-test/t/disabled.def index d2ab8158c51..9bfe9567d83 100644 --- a/mysql-test/t/disabled.def +++ b/mysql-test/t/disabled.def @@ -10,11 +10,3 @@ # ############################################################################## -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 - |