bk commit into 4.1 tree (joreland:1.2171)

[jonas.oreland]

Below is the list of changes that have just been committed into a local
4.1 repository of jonas. When jonas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.2171 05/02/10 18:15:15 joreland@stripped +4 -0
  ndb - add more tests to autotest

  ndb/test/run-test/run-test.hpp
    1.4 05/02/10 18:15:12 joreland@stripped +1 -0
    Add bench mode. always produce report

  ndb/test/run-test/main.cpp
    1.24 05/02/10 18:15:12 joreland@stripped +7 -2
    Add bench mode. always produce report

  ndb/test/run-test/daily-devel-tests.txt
    1.15 05/02/10 18:15:12 joreland@stripped +29 -0
    Add benchmark to devel suite

  ndb/test/run-test/daily-basic-tests.txt
    1.16 05/02/10 18:15:12 joreland@stripped +1 -1
    run mysql-test-run for max 1 hour
      (normally 30 minutes)

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	joreland
# Host:	eel.hemma.oreland.se
# Root:	/home/jonas/src/mysql-4.1

--- 1.15/ndb/test/run-test/daily-basic-tests.txt	Sun Feb  6 10:00:26 2005
+++ 1.16/ndb/test/run-test/daily-basic-tests.txt	Thu Feb 10 18:15:12 2005
@@ -1,4 +1,4 @@
-max-time: 25000
+max-time: 3600
 cmd: atrt-mysql-test-run
 args: --force
 

--- 1.14/ndb/test/run-test/daily-devel-tests.txt	Tue Jan 25 15:56:18 2005
+++ 1.15/ndb/test/run-test/daily-devel-tests.txt	Thu Feb 10 18:15:12 2005
@@ -204,3 +204,32 @@
 cmd: test_event
 args: -n BasicEventOperation T1 T6 
 
+max-time: 300
+cmd: DbCreate
+args:
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 1
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 25
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 100
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 200
+type: bench
+
+max-time: 180
+cmd: DbAsyncGenerator
+args: -t 60 -p 1 -proc 25
+type: bench
+

--- 1.23/ndb/test/run-test/main.cpp	Wed Dec 22 10:01:28 2004
+++ 1.24/ndb/test/run-test/main.cpp	Thu Feb 10 18:15:12 2005
@@ -219,7 +219,7 @@
       fflush(g_report_file);
     }    
 
-    if(g_mode_bench || (g_mode_regression && result)){
+    if(test_case.m_report || g_mode_bench || (g_mode_regression && result)){
       BaseString tmp;
       tmp.assfmt("result.%d", test_no);
       if(rename("result", tmp.c_str()) != 0){
@@ -228,7 +228,7 @@
 	goto end;
       }
     }
-
+    
     if(g_mode_interactive && result){
       g_logger.info
 	("Encountered failed test in interactive mode - terminating");
@@ -908,6 +908,11 @@
     tc.m_max_time = 60000;
   else
     tc.m_max_time = atoi(mt);
+
+  if(p.get("type", &mt) && strcmp(mt, "bench") == 0)
+    tc.m_report= true;
+  else
+    tc.m_report= false;
   
   return true;
 }

--- 1.3/ndb/test/run-test/run-test.hpp	Tue May 11 22:34:13 2004
+++ 1.4/ndb/test/run-test/run-test.hpp	Thu Feb 10 18:15:12 2005
@@ -68,6 +68,7 @@
 };
 
 struct atrt_testcase {
+  bool m_report;
   time_t m_max_time;
   BaseString m_command;
   BaseString m_args;