diff options
| author | msvensson@neptunus.(none) <> | 2005-09-28 11:34:53 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2005-09-28 11:34:53 +0200 |
| commit | fbf4a5e07962792a918207541a2666a7968df4ca (patch) | |
| tree | 5b0761b29daf8c864538d0fb55e20e9b54758e47 /Makefile.am | |
| parent | 70b9b5eef34a608f415db270e1914e6163d90ced (diff) | |
| parent | 1105d4293dfa37e1658956b07e48908495fa65f7 (diff) | |
| download | mariadb-git-fbf4a5e07962792a918207541a2666a7968df4ca.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index ee0353349ea..3be3ce80b71 100644 --- a/Makefile.am +++ b/Makefile.am @@ -109,13 +109,18 @@ MYSQL_TEST_RUN_ARGS = --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) test: cd mysql-test ; \ - ./mysql-test-run.pl $(MYSQL_TEST_RUN_ARGS) && \ - ./mysql-test-run.pl --ps-protocol $(MYSQL_TEST_RUN_ARGS) + ./mysql-test-run \ + --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ + --master_port=$(MYSQL_TEST_MASTER_PORT) \ + --slave_port=$(MYSQL_TEST_SLAVE_PORT) \ + --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) && \ + ./mysql-test-run --ps-protocol \ + --manager-port=$(MYSQL_TEST_MANAGER_PORT) \ + --master_port=$(MYSQL_TEST_MASTER_PORT) \ + --slave_port=$(MYSQL_TEST_SLAVE_PORT) \ + --ndbcluster_port=$(MYSQL_TEST_NDB_PORT) test-force: - cd mysql-test ; \ - ./mysql-test-run --force $(MYSQL_TEST_RUN_ARGS) ; \ - ./mysql-test-run --ps-protocol --force $(MYSQL_TEST_RUN_ARGS) - -# Don't update the files from bitkeeper -%::SCCS/s.% + cd mysql-test; \ + ./mysql-test-run --force ;\ + ./mysql-test-run --ps-protocol --force |