Commit b4d232d7 authored by joreland@mysql.com's avatar joreland@mysql.com

Merge mysql.com:/home/jonas/src/mysql-4.1

into mysql.com:/home/jonas/src/mysql-5.0
parents 3a65f15d e0cd99c2
max-time: 25000 max-time: 3600
cmd: atrt-mysql-test-run cmd: atrt-mysql-test-run
args: --force args: --force
......
...@@ -204,3 +204,32 @@ max-time: 2500 ...@@ -204,3 +204,32 @@ max-time: 2500
cmd: test_event cmd: test_event
args: -n BasicEventOperation T1 T6 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
...@@ -219,7 +219,7 @@ main(int argc, const char ** argv){ ...@@ -219,7 +219,7 @@ main(int argc, const char ** argv){
fflush(g_report_file); 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; BaseString tmp;
tmp.assfmt("result.%d", test_no); tmp.assfmt("result.%d", test_no);
if(rename("result", tmp.c_str()) != 0){ if(rename("result", tmp.c_str()) != 0){
...@@ -909,6 +909,11 @@ read_test_case(FILE * file, atrt_testcase& tc, int& line){ ...@@ -909,6 +909,11 @@ read_test_case(FILE * file, atrt_testcase& tc, int& line){
else else
tc.m_max_time = atoi(mt); 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; return true;
} }
......
...@@ -68,6 +68,7 @@ struct atrt_config { ...@@ -68,6 +68,7 @@ struct atrt_config {
}; };
struct atrt_testcase { struct atrt_testcase {
bool m_report;
time_t m_max_time; time_t m_max_time;
BaseString m_command; BaseString m_command;
BaseString m_args; BaseString m_args;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment