diff options
| author | unknown <msvensson@shellback.(none)> | 2006-09-01 10:25:50 +0200 |
|---|---|---|
| committer | unknown <msvensson@shellback.(none)> | 2006-09-01 10:25:50 +0200 |
| commit | 8f9a867b77df584fd79369733892ccda58204bff (patch) | |
| tree | 3d8cfeb64cbc7a8f601c15e082171df087d75761 /mysql-test/Makefile.am | |
| parent | 4e16868d88425ff5075fccc348ddb09acc3e7bf7 (diff) | |
| parent | 1bb1679c19614f3a2883e76fd03b09a216be4892 (diff) | |
| download | mariadb-git-8f9a867b77df584fd79369733892ccda58204bff.tar.gz | |
Merge shellback.(none):/home/msvensson/mysql/mtr/my41-mtr
into shellback.(none):/home/msvensson/mysql/mtr/my50-mtr
BitKeeper/etc/ignore:
auto-union
mysql-test/Makefile.am:
Manual merge 4.1 -> 5.0
Diffstat (limited to 'mysql-test/Makefile.am')
| -rw-r--r-- | mysql-test/Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am index 11bcef10fff..9f54b4fe192 100644 --- a/mysql-test/Makefile.am +++ b/mysql-test/Makefile.am @@ -34,7 +34,7 @@ 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 +GENSCRIPTS = 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 \ @@ -112,6 +112,11 @@ std_data/server-cert.pem: $(top_srcdir)/SSL/$(@F) std_data/server-key.pem: $(top_srcdir)/SSL/$(@F) @RM@ -f $@; @CP@ $(top_srcdir)/SSL/$(@F) $(srcdir)/std_data +# mtr - a shortcut for executing mysql-test-run.pl +mtr: + $(RM) -f mtr + $(LN_S) mysql-test-run.pl mtr + SUFFIXES = .sh .sh: |