merge

ndb/test/run-test/atrt-mysql-test-run

@@ -5,8 +5,8 @@ p=`pwd`
 cd $MYSQL_BASE_DIR/mysql-test 
 ./mysql-test-run --with-ndbcluster --ndb-connectstring=$NDB_CONNECTSTRING $* | tee $p/output.txt
 
-f=`grep -c '[ fail ]' $p/output.txt`
-o=`grep -c '[ pass ]' $p/output.txt`
+f=`grep -c '\[ fail \]' $p/output.txt`
+o=`grep -c '\[ pass \]' $p/output.txt`
 
 if [ $o -gt 0 -a $f -eq 0 ]
 then

ndb/test/run-test/daily-basic-tests.txt

@@ -1,3 +1,11 @@
+max-time: 25000
+cmd: atrt-mysql-test-run
+args: --force
+
+max-time: 600
+cmd: atrt-testBackup
+args: -n BackupOne T1 T6 T3 I3
+
 # BASIC FUNCTIONALITY
 max-time: 500
 cmd: testBasic

ndb/test/run-test/daily-devel-tests.txt

@@ -1,7 +1,3 @@
-max-time: 25000
-cmd: atrt-mysql-test-run
-args: --force
-
 #
 # INDEX
 #
@@ -22,10 +18,6 @@ args: -n CreateLoadDrop T1 T10
 #
 # BACKUP
 #
-max-time: 600
-cmd: atrt-testBackup
-args: -n BackupOne T1 T6 T3 I3
-
 max-time: 1000
 cmd: atrt-testBackup
 args: -n BackupBank T6