diff options
| -rw-r--r-- | Makefile.am | 18 | ||||
| -rw-r--r-- | mysql-test/Makefile.am | 20 | ||||
| -rw-r--r-- | mysql-test/mysql-test-run-shell.sh (renamed from mysql-test/mysql-test-run.sh) | 0 |
3 files changed, 16 insertions, 22 deletions
diff --git a/Makefile.am b/Makefile.am index e45ae5222c0..6b79b72ec4c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -124,22 +124,10 @@ test-force: ./mysql-test-run --force && \ ./mysql-test-run --ps-protocol --force -# We are testing a new Perl version of the test script -test-pl: +test-force-mem: cd mysql-test; \ - ./mysql-test-run.pl && \ - ./mysql-test-run.pl --ps-protocol + ./mysql-test-run --force --mem && \ + ./mysql-test-run --ps-protocol --force --mem -test-force-pl: - cd mysql-test; \ - ./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 -# Don't update the files from bitkeeper -%::SCCS/s.% diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 9f54b4fe192..aae6ce64574 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 valgrind.supp $(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 \ @@ -117,6 +118,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 index 9e19a8cad7e..9e19a8cad7e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run-shell.sh |