Commit 313ea47d authored by unknown's avatar unknown
Browse files

Add new option "check-testcases" to mysql-test-run.pl 

Cleanup the sideeffects from most of the  testcases with sideeffects.


mysql-test/mysql-test-run.pl:
  Add option "check-testcases" to mysql-test-run.pl
  Will execute "include/check-testcase.test" once before each tescase and record the output into "var/tmp/check-testcase.result"
  After the teastcase it will run again and this time compare the output with previously recorded file.
mysql-test/r/analyze.result:
  Drop table t1 at end of test
mysql-test/r/create_select_tmp.result:
  Drop table t1 at end of test
mysql-test/r/ctype_cp932.result:
  Drop table t1 at end of test
mysql-test/r/ctype_recoding.result:
  Drop table t1 at end of test
mysql-test/r/grant2.result:
  Drop user mysqltest_2 and mysqltest_A@'%'
mysql-test/r/join_outer.result:
  Drop view v1 to cleanup
mysql-test/r/ps_1general.result:
  Drop table t1 at end of test
mysql-test/r/query_cache.result:
  Drop function "f1"
mysql-test/r/read_only.result:
  Reset the "read_only" flag
mysql-test/r/rpl000001.result:
  Remove user "blafasel2"
mysql-test/r/rpl000017.result:
  Remove user "replicate"
mysql-test/r/rpl_failed_optimize.result:
  Drop table t1 to cleanup
mysql-test/r/rpl_flush_tables.result:
  Drop tables t3, t4, t5
mysql-test/r/rpl_ignore_revoke.result:
  Delete user "user_foo"
mysql-test/r/rpl_insert_id.result:
  Drop table t1 to cleanup
mysql-test/r/rpl_loaddata.result:
  Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_m.result:
  Drop tyable t1 to cleanup
mysql-test/r/rpl_loaddata_rule_s.result:
  Drop tyable t1 to cleanup
mysql-test/r/rpl_misc_functions.result:
  Drop tyable t1 to cleanup
mysql-test/r/rpl_multi_update3.result:
  Drop tyable t1 and t2 to cleanup
mysql-test/r/rpl_replicate_do.result:
  Drop tyable t1 to cleanup
mysql-test/r/rpl_skip_error.result:
  Drop tyable t1 to cleanup
mysql-test/r/rpl_slave_status.result:
  Drop tyable t1 to cleanup
mysql-test/r/sp-prelocking.result:
  Drop view v1 and tables t1, t2, t3 and t4 to cleanup
mysql-test/r/sp-security.result:
  Delete users to cleanup
  Delete remaining traces in tables_priv and procs_priv
mysql-test/r/subselect_innodb.result:
  Drop procedure p1 to cleanup
mysql-test/r/trigger-compat.result:
  Drop trigger wl2818_trg1 and wl2818_trg2.
  Drop table t1, t2
  Drop database mysqltest_db1
  And the users "mysqltest_dfn@localhost" and "mysqltest_inv@localhost"
mysql-test/r/type_bit.result:
  Drop tables t1 and t2 to cleanup
mysql-test/r/variables.result:
  Set GLOBAL max_join_size to 10 as it originally was in variables-master.opt
mysql-test/r/view_grant.result:
  Dop user "test@localhost" to cleanup
mysql-test/t/analyze.test:
  Drop table t1 to cleanup
mysql-test/t/create_select_tmp.test:
  Drop table t1 to cleanup
mysql-test/t/ctype_cp932.test:
  Drop table t1 to cleanup
mysql-test/t/ctype_recoding.test:
  Drop table t1 to cleanup
mysql-test/t/fulltext_var.test:
  Restore the original ft_boolean_syntax
mysql-test/t/grant2.test:
  Drop users "mysqltest_2" and "mysqltest_A@'%'" to cleanup
mysql-test/t/innodb_cache.test:
  Reset query_cache_size to original value
mysql-test/t/join_outer.test:
  Drop view v1 to cleanup
mysql-test/t/ps_1general.test:
  Drop table t1 to cleanup
mysql-test/t/query_cache.test:
  Drop function "f1" to cleanup
mysql-test/t/read_only.test:
  Reset the readonly flag
mysql-test/t/rpl000001.test:
  Delete user "blafasel2" to cleanup
mysql-test/t/rpl000017.test:
  Delete user "replicate" to cleanup
mysql-test/t/rpl_failed_optimize.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_flush_tables.test:
  Droip table t3, t4 and t5 to cleanup
mysql-test/t/rpl_ignore_revoke.test:
  Delet user "user_foo" to cleanup
mysql-test/t/rpl_insert_id.test:
  drop table t1 to cleanup
mysql-test/t/rpl_loaddata.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_m.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_loaddata_rule_s.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_misc_functions.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_multi_update3.test:
  Drop table t1 and t2 to cleanup
mysql-test/t/rpl_replicate_do.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_skip_error.test:
  Drop table t1 to cleanup
mysql-test/t/rpl_slave_status.test:
  Drop table t1 to cleanup
mysql-test/t/sp-prelocking.test:
  Drop table t1, t2 t3 and t4 to cleanup
  Drop view v1
mysql-test/t/sp-security.test:
  Delete  test users from mysql.user, mysql.db, mysql.procs_priv and mysql.tables_priv
  Drop table t1 to cleanup
mysql-test/t/subselect_innodb.test:
  Drop procedure p1 to cleanup
mysql-test/t/trigger-compat.test:
  Drop trigger wl2818_trg1 and wl2818_trg2 to cleanup
  Drop table t1, t2
  Drop users
  drop database mysqltest_db1
mysql-test/t/type_bit.test:
  drop table t1 and t2 to cleanup
mysql-test/t/variables-master.opt:
  Increase max_join_size to 100.
mysql-test/t/variables.test:
  Set max_join_size to 10, which was the original value in variables-master.opt
mysql-test/t/view_grant.test:
  Drop the user "test@localhost"
mysql-test/include/check-testcase.test:
  New BitKeeper file ``mysql-test/include/check-testcase.test''
parent 113290fe

mysql-test/include/check-testcase.test

0 → 100644
+51 −0
Original line number Diff line number Diff line 
#

# This test is executed twice for each test case if mysql-test-run is passed

# the flag --check-testcase.

# Before every testcase it's run with mysqltest in record mode and will

# thus produce an output file

# that can be compared to output from after the tescase.

# In that way it's possible to check that a testcase does not have

# any unwanted side affects.

#



#

# Dump all global variables

#

show global variables;



#

# Dump all databases

#

show databases;



#

# Dump the "test" database, all it's tables and their data

#

--exec $MYSQL_DUMP --skip-comments test



#

# Dump the "mysql" database and it's tables

# Select data separately to add "order by"

#

--exec $MYSQL_DUMP --skip-comments --no-data mysql

use mysql;

select * from columns_priv;

select * from db order by host, db, user;

select * from func;

select * from help_category;

select * from help_keyword;

select * from help_relation;

select * from help_relation;

select * from host;

select * from proc;

select * from procs_priv;

select * from tables_priv;

select * from time_zone;

select * from time_zone_leap_second;

select * from time_zone_name;

select * from time_zone_transition;

select * from time_zone_transition_type;

select * from user;

mysql-test/mysql-test-run.pl

+63 −1
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ our $opt_manager_port; # Does nothing now, we never use manager 
our $opt_old_master;



our $opt_record;

our $opt_check_testcases;



our $opt_result_ext;
@@ -545,6 +546,7 @@ sub command_line_setup () { 


             # Test case authoring

             'record'                   => \$opt_record,

             'check-testcases'          => \$opt_check_testcases,



             # ???

             'mysqld=s'                 => \@opt_extra_mysqld_opt,
@@ -2497,6 +2499,54 @@ sub im_stop($) { 
  $instance_manager->{'pid'} = undef;

}



#

# Run include/check-testcase.test

# Before a testcase, run in record mode, save result file to var

# After testcase, run and compare with the recorded file, they should be equal!

#

sub run_check_testcase ($) {



  my $mode=     shift;



  my $args;

  mtr_init_args(\$args);



  mtr_add_arg($args, "--no-defaults");

  mtr_add_arg($args, "--silent");

  mtr_add_arg($args, "-v");

  mtr_add_arg($args, "--skip-safemalloc");

  mtr_add_arg($args, "--tmpdir=%s", $opt_tmpdir);



  mtr_add_arg($args, "--socket=%s", $master->[0]->{'path_mysock'});

  mtr_add_arg($args, "--port=%d", $master->[0]->{'path_myport'});

  mtr_add_arg($args, "--database=test");

  mtr_add_arg($args, "--user=%s", $opt_user);

  mtr_add_arg($args, "--password=");



  mtr_add_arg($args, "-R");

  mtr_add_arg($args, "$opt_vardir/tmp/check-testcase.result");



  if ( $mode eq "before" )

  {

    mtr_add_arg($args, "--record");

  }



  my $res = mtr_run_test($exe_mysqltest,$args,

	        "include/check-testcase.test", "", "", "");



  if ( $res == 1  and $mode = "after")

  {

    mtr_run("diff",["-u",

		    "$opt_vardir/tmp/check-testcase.result",

		    "$opt_vardir/tmp/check-testcase.reject"],

	    "", "", "", "");

  }

  elsif ( $res )

  {

    mtr_error("Could not execute 'check-testcase' $mode testcase");

  }

}



sub run_mysqltest ($) {

  my $tinfo=       shift;
@@ -2726,7 +2776,18 @@ sub run_mysqltest ($) { 
    mtr_add_arg($args, "--record");

  }



  return mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");

  if ( $opt_check_testcases )

  {

    run_check_testcase("before");

  }



  my $res = mtr_run_test($exe,$args,$tinfo->{'path'},"",$path_timefile,"");



  if ( $opt_check_testcases )

  {

    run_check_testcase("after");

  }

  return $res;

}
@@ -2808,6 +2869,7 @@ Options that specify ports 
Options for test case authoring



  record TESTNAME       (Re)genereate the result file for TESTNAME

  check-testcases       Check testcases for sideeffects



Options that pass on options

mysql-test/r/analyze.result

+1 −0
Original line number Diff line number Diff line
@@ -46,3 +46,4 @@ Field_name Min_value Max_value Min_length Max_length Empties_or_zeros Nulls Avg_ 
execute stmt1;

Field_name	Min_value	Max_value	Min_length	Max_length	Empties_or_zeros	Nulls	Avg_value_or_avg_length	Std	Optimal_fieldtype

deallocate prepare stmt1;

drop table t1;

mysql-test/r/create_select_tmp.result

+1 −0
Original line number Diff line number Diff line
@@ -17,3 +17,4 @@ CREATE TEMPORARY TABLE t2 ( PRIMARY KEY (a) ) ENGINE=MYISAM SELECT a FROM t1; 
ERROR 23000: Duplicate entry '1' for key 1

select * from t2;

ERROR 42S02: Table 'test.t2' doesn't exist

drop table t1;

mysql-test/r/ctype_cp932.result

+1 −0
Original line number Diff line number Diff line
@@ -11366,3 +11366,4 @@ col1 
a

a

a

drop table t1;