From fc449ac174d616b015998a5cd6f2f9bfa80da812 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 9 Nov 2006 09:48:50 +0100 Subject: [PATCH 1/7] Fix problem when running mysql_client_test in "binary dist", path should include the binary name --- mysql-test/mysql-test-run.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 9bf0f8df632..d788140dd4a 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1484,7 +1484,7 @@ sub executable_setup () { mtr_exe_maybe_exists("$glob_basedir/tests/mysql_client_test", "$glob_basedir/tests/release/mysql_client_test", "$glob_basedir/tests/debug/mysql_client_test", - "$glob_basedir/bin"); + "$glob_basedir/bin/mysql_client_test"); } } From 68ae8da64cf3cdb5e3e5e900b4b1f6daa65327ec Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 10 Nov 2006 15:58:38 +0100 Subject: [PATCH 2/7] Look for "mysqlmanager" also in "bin" directory Improve log message --- mysql-test/mysql-test-run.pl | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index d788140dd4a..7809f582ef9 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -1328,7 +1328,8 @@ sub executable_setup_im () { $exe_im= mtr_exe_maybe_exists( "$glob_basedir/server-tools/instance-manager/mysqlmanager", - "$glob_basedir/libexec/mysqlmanager"); + "$glob_basedir/libexec/mysqlmanager", + "$glob_basedir/bin/mysqlmanager"); return ($exe_im eq ""); } @@ -3040,7 +3041,7 @@ sub run_testcase ($) { # ------------------------------------------------------- $ENV{'TZ'}= $tinfo->{'timezone'}; - mtr_verbose("Starting server with timezone: $tinfo->{'timezone'}"); + mtr_verbose("Setting timezone: $tinfo->{'timezone'}"); my $master_restart= run_testcase_need_master_restart($tinfo); my $slave_restart= run_testcase_need_slave_restart($tinfo); From 27a0ce64ff5f95302fa92a7f0813209fdaaeeefd Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 12:44:12 +0100 Subject: [PATCH 3/7] Make --mem a pure flag. If there is need to specifically set the location use MTR_MEM environment variable --- mysql-test/mysql-test-run.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl index 7809f582ef9..7758d5ee5a6 100755 --- a/mysql-test/mysql-test-run.pl +++ b/mysql-test/mysql-test-run.pl @@ -667,7 +667,7 @@ sub command_line_setup () { 'tmpdir=s' => \$opt_tmpdir, 'vardir=s' => \$opt_vardir, 'benchdir=s' => \$glob_mysql_bench_dir, - 'mem:s' => \$opt_mem, + 'mem' => \$opt_mem, # Misc 'comment=s' => \$opt_comment, @@ -4632,9 +4632,9 @@ Options to control directories to use vardir=DIR The directory where files generated from the test run is stored (default: ./var). Specifying a ramdisk or tmpfs will speed up tests. - mem[=DIR] Run testsuite in "memory" using tmpfs or ramdisk - Attempts to use DIR first if specified else - uses as builtin list of standard locations + mem Run testsuite in "memory" using tmpfs or ramdisk + Attempts to find a suitable location + using a builtin list of standard locations for tmpfs (/dev/shm) The option can also be set using environment variable MTR_MEM=[DIR] From 24ca44731d3a60beae495acdaec15f9639dfb952 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 13:32:39 +0100 Subject: [PATCH 4/7] Remove the tmp file produced when checking abi --- include/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/include/Makefile.am b/include/Makefile.am index a17ef377e78..3a3b319505c 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -69,6 +69,7 @@ abi_check: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \ if [ @ICHECK@ != no ] ; then \ @ICHECK@ --canonify --skip-from-re /usr/ -o $@.ic mysql.h; \ @ICHECK@ --compare mysql_h.ic $@.ic; \ + $(RM) -f $@.ic; \ fi; \ touch abi_check; From 6da91bfff33f9e472b30330620f215e9bacc3284 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 19:12:34 +0100 Subject: [PATCH 5/7] Use mysql-test-run.pl mysql-test/mysql-test-run-shell.sh: Rename: mysql-test/mysql-test-run.sh -> mysql-test/mysql-test-run-shell.sh mysql-test/Makefile.am: Remove build of mysql_test_run_new Symlink mysql-test-run.pl to mysql-test-run Rename mysql-test-run.sh to mysql-test-run-shell.sh --- mysql-test/Makefile.am | 20 ++++++++++++------- ...ql-test-run.sh => mysql-test-run-shell.sh} | 0 2 files changed, 13 insertions(+), 7 deletions(-) rename mysql-test/{mysql-test-run.sh => mysql-test-run-shell.sh} (100%) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 1e6eb12f7b2..3307b870c66 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -33,19 +33,20 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS) -EXTRA_DIST = $(EXTRA_SCRIPTS) -GENSCRIPTS = mysql-test-run install_test_db mtr +EXTRA_DIST = $(EXTRA_SCRIPTS) +GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr PRESCRIPTS = mysql-test-run.pl test_SCRIPTS = $(GENSCRIPTS) $(PRESCRIPTS) -test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem \ - std_data/server-cert.pem std_data/server-key.pem +test_DATA = std_data/client-key.pem \ + std_data/client-cert.pem \ + std_data/cacert.pem \ + std_data/server-cert.pem \ + std_data/server-key.pem CLEANFILES = $(GENSCRIPTS) $(test_DATA) INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. -EXTRA_PROGRAMS = mysql_test_run_new -noinst_HEADERS = my_manage.h -mysql_test_run_new_SOURCES= mysql_test_run_new.c my_manage.c my_create_tables.c +noinst_HEADERS = my_manage.h dist-hook: mkdir -p $(distdir)/t $(distdir)/r $(distdir)/include \ @@ -110,6 +111,11 @@ mtr: $(RM) -f mtr $(LN_S) mysql-test-run.pl mtr +# mysql-test-run - a shortcut for executing mysql-test-run.pl +mysql-test-run: + $(RM) -f mysql-test-run + $(LN_S) mysql-test-run.pl mysql-test-run + SUFFIXES = .sh .sh: diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run-shell.sh similarity index 100% rename from mysql-test/mysql-test-run.sh rename to mysql-test/mysql-test-run-shell.sh From 1eb70558efbc61313ee0892e369343915b653ea6 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 13 Nov 2006 19:16:23 +0100 Subject: [PATCH 6/7] Remove test-force-pl-mem and add test-force-mem --- Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 8d0746e6a64..ab9a7a33a44 100644 --- a/Makefile.am +++ b/Makefile.am @@ -114,6 +114,12 @@ test-force: ./mysql-test-run --force && \ ./mysql-test-run --ps-protocol --force +test-force-mem: + cd mysql-test; \ + ./mysql-test-run --force --mem && \ + ./mysql-test-run --ps-protocol --force --mem + + # We are testing a new Perl version of the test script test-pl: cd mysql-test; \ @@ -125,7 +131,3 @@ test-force-pl: ./mysql-test-run.pl --force && \ ./mysql-test-run.pl --ps-protocol --force -test-force-pl-mem: - cd mysql-test; \ - ./mysql-test-run.pl --force --mem && \ - ./mysql-test-run.pl --ps-protocol --force --mem From 178dddb54f0085a9df637d847105f77986bbadf4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 14 Nov 2006 09:42:01 +0100 Subject: [PATCH 7/7] Fix "make dist" --- mysql-test/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 3307b870c66..4afab8b0281 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -32,7 +32,8 @@ endif benchdir_root= $(prefix) testdir = $(benchdir_root)/mysql-test -EXTRA_SCRIPTS = mysql-test-run.sh install_test_db.sh $(PRESCRIPTS) +EXTRA_SCRIPTS = mysql-test-run-shell.sh install_test_db.sh \ + $(PRESCRIPTS) EXTRA_DIST = $(EXTRA_SCRIPTS) GENSCRIPTS = mysql-test-run-shell mysql-test-run install_test_db mtr PRESCRIPTS = mysql-test-run.pl