1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into mysql.com:/home/jonas/src/mysql-4.1
This commit is contained in:
joreland@mysql.com 2005-01-25 15:57:08 +01:00
commit fa4f07b81d
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ndb/test/run-test/atrt-mysql-test-run
View File

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

8
ndb/test/run-test/daily-basic-tests.txt
View File

@ -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 # BASIC FUNCTIONALITY
max-time: 500 max-time: 500
cmd: testBasic cmd: testBasic

8
ndb/test/run-test/daily-devel-tests.txt
View File

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