summaryrefslogtreecommitdiff
path: root/ndb/test
diff options
context:
space:
mode:
authorunknown <joreland@mysql.com>2004-07-11 08:49:01 +0200
committerunknown <joreland@mysql.com>2004-07-11 08:49:01 +0200
commit98083dd6eb9468c894ba133a95ab223c67d069ba (patch)
treeae1a6c1453658aa1fd7d888d7f495822f735b35c /ndb/test
parent544f52f11c143c28c8b1af20968b0e809ba84d8e (diff)
downloadmariadb-git-98083dd6eb9468c894ba133a95ab223c67d069ba.tar.gz
testSystemRestart -n SR1
Handle arbit during system shutdown ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp: Handle arbit during system shutdown ndb/src/kernel/blocks/qmgr/QmgrMain.cpp: Handle arbit during system shutdown ndb/test/run-test/daily-basic-tests.txt: Moved testOIBasix + testSystemRestart -n SR1/SR2 to basic tests ndb/test/run-test/daily-devel-tests.txt: Moved testOIBasix + testSystemRestart -n SR1/SR2 to basic tests
Diffstat (limited to 'ndb/test')
-rw-r--r--ndb/test/run-test/daily-basic-tests.txt36
-rw-r--r--ndb/test/run-test/daily-devel-tests.txt32
2 files changed, 36 insertions, 32 deletions
diff --git a/ndb/test/run-test/daily-basic-tests.txt b/ndb/test/run-test/daily-basic-tests.txt
index 2f0988419f7..0b64d9cf9c2 100644
--- a/ndb/test/run-test/daily-basic-tests.txt
+++ b/ndb/test/run-test/daily-basic-tests.txt
@@ -794,3 +794,39 @@ max-time: 300
cmd: testBlobs
args:
+max-time: 2500
+cmd: testOIBasic
+args:
+
+#
+#
+# SYSTEM RESTARTS
+#
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T6
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T7
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR1 T8
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR2 T1
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR2 T6
+
+max-time: 1500
+cmd: testSystemRestart
+args: -n SR2 T7
+
diff --git a/ndb/test/run-test/daily-devel-tests.txt b/ndb/test/run-test/daily-devel-tests.txt
index e967de2aea3..3c72135334b 100644
--- a/ndb/test/run-test/daily-devel-tests.txt
+++ b/ndb/test/run-test/daily-devel-tests.txt
@@ -39,34 +39,6 @@ args: -n SingleUserMode T1
#
max-time: 1500
cmd: testSystemRestart
-args: -n SR1 T1
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T6
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T7
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR1 T8
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR2 T1
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR2 T6
-
-max-time: 1500
-cmd: testSystemRestart
-args: -n SR2 T7
-
-max-time: 1500
-cmd: testSystemRestart
args: -n SR_UNDO T1
max-time: 1500
@@ -230,7 +202,3 @@ max-time: 2500
cmd: test_event
args: -n BasicEventOperation T1 T6
-max-time: 2500
-cmd: testOIBasic
-args:
-