diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 19:12:34 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 19:12:34 +0100 |
| commit | 6da91bfff33f9e472b30330620f215e9bacc3284 (patch) | |
| tree | 2a56a2f6590c30923bbd4364219ac54aa85484d2 | |
| parent | 24ca44731d3a60beae495acdaec15f9639dfb952 (diff) | |
| download | mariadb-git-6da91bfff33f9e472b30330620f215e9bacc3284.tar.gz | |
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
| -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 |
2 files changed, 13 insertions, 7 deletions
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 index 141a725db2e..141a725db2e 100644 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run-shell.sh |