Merge lp:~kalebral-deactivatedaccount/drizzle-automation/update-config-file into lp:drizzle-automation

[Lee Bieber]

[Lee Bieber (kalebral-deactivatedaccount)]

update configuration files, had to remove --executor as it is no longer a valid flag in randgen. Also some tweaks to automation.cnf

=== modified file 'drizzle/automation/config/automation.cnf'
--- drizzle/automation/config/automation.cnf	2009-09-29 23:00:03 +0000
+++ drizzle/automation/config/automation.cnf	2009-10-09 22:27:11 +0000
@@ -50,19 +50,29 @@
 randgen_home= /home/drizzle/repos/randgen
 
 [randgen_tests]
-basic= --queries=15 --threads=10 --engine=Innodb --gendata=conf/example.zz --grammar=conf/example.yy
-limit_validator= --queries=10000 --threads=100 --engine=Innodb --grammar=conf/subquery_semijoin_drizzle.yy --validator=Limit
-optimized_semijoin_compare= --queries=10000 --threads=100 --engine=Innodb --grammar=conf/subquery_semijoin_drizzle.yy --validator=ResultsetComparator
-orderby_validator= --queries=10000 --threads=100 --engine=Innodb --grammar=conf/subquery_semijoin_drizzle.yy --validator=OrderBy
-repeatable_read= --queries=10000 --threads=100 --engine=Innodb --gendata=conf/transactions.zz --grammar=conf/repeatable_read.yy --validator=RepeatableRead
-select_stability_validator= --queries=10000 --threads=100 --engine=Innodb --grammar=conf/subquery_materialization_drizzle.yy --validator=SelectStability
+basic= --queries=50 --threads=7 --gendata=conf/drizzle.zz --grammar=conf/drizzle.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
+combinations= --queries=10000 --threads=10 --gendata=conf/combinations_drizzle.zz --grammar=conf/combinations.yy --reporters=ErrorLog,Backtrace -validators=ErrorMessageCorruption --engine=Innodb
+database_consistency_after_recovery= --queries=100 --threads=5 --gendata=conf/transactions.zz --grammar=conf/transactions.yy --reporters=RecoveryConsistency -validators=ErrorMessageCorruption --engine=Innodb
+database_integrity_after_recovery= --queries=100 --threads=5 --gendata=conf/drizzle.zz --grammar=conf/drizzle.yy --reporters=Recovery -validators=ErrorMessageCorruption --engine=Innodb
+limit_validator= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_drizzle.yy --reporters=ErrorLog,Backtrace --validators=Limit --engine=Innodb
+many_indexes= --queries=5 --threads=2 --gendata=conf/many_indexes_drizzle.zz --grammar=conf/many_indexes_drizzle.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
+optimized_semijoin_compare= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_drizzle.yy --reporters=ErrorLog,Backtrace --validators=ResultsetComparator --engine=Innodb
+optimizer_basic= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/optimizer_basic.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
+optimizer_simple= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/optimizer_simple.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
+orderby_validator= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_drizzle.yy --reporters=ErrorLog,Backtrace --validators=OrderBy --engine=Innodb
+repeatable_read= --queries=100 --threads=5 --gendata=conf/transactions.zz --grammar=conf/repeatable_read.yy -reporters=ErrorLog,Backtrace --validators=RepeatableRead  --engine=Innodb
+select_stability_validator= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_materialization_drizzle.yy --reporters=ErrorLog,Backtrace --validators=SelectStability --engine=Innodb
+subquery= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_drizzle.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
+subquery_semijoin_nested= --queries=10000 --threads=10 --gendata=conf/drizzle.zz --grammar=conf/subquery_semijoin_nested_drizzle.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
+transactional_integrity= --queries=10 --threads=5 --gendata=conf/transactions.zz --grammar=conf/transactions.yy --reporters=ErrorLog,Backtrace --validator=DatabaseConsistency --engine=Innodb
+varchar= --queries=25 --threads=3 --gendata=conf/varchar_drizzle.zz --grammar=conf/varchar.yy --reporters=ErrorLog,Backtrace --validators=ErrorMessageCorruption --engine=Innodb
 
 [sqlbench]
 
 # configuration name for use in sysbench_config table
-sqlbench_config_name= sysbench
+sqlbench_config_name= sqlbench
 # location of the sql bench repository
-sqlbench_home= /home/drizzle/repos/sqlbench
+sqlbench_home= /home/drizzle/repos/sql-bench
 # Email recipients to receive a text regression report on completion of
 # a sqlbench run. Comma separated.
 report_email= [e-mail]
@@ -73,7 +83,6 @@
 # a sysbench run. Comma separated.
 report_email= [e-mail]
 
-
 [sloc]
 
 # Directories queried during SLOCcount processing

=== modified file 'drizzle/automation/randgen/run.py'
--- drizzle/automation/randgen/run.py	2009-09-29 23:00:03 +0000
+++ drizzle/automation/randgen/run.py	2009-10-09 22:27:11 +0000
@@ -127,7 +127,7 @@
   pass_tests= 0
   for key in list_of_tests.keys():
     # run the test
-    cmd= "perl gentest.pl --dsn=dbi:drizzle:host=localhost:port=%s:user=root:password="":database=test --executor=drizzle %s" % (server.getPort(),list_of_tests[key])
+    cmd= "./gentest.pl --dsn=dbi:drizzle:host=localhost:port=%s:user=root:password="":database=test  %s" % (server.getPort(),list_of_tests[key])
     logging.info("Running : %s with %s" % (key, cmd))
     server.start()
     (retcode, output)= commands.getstatusoutput(cmd)