diff options
| author | unknown <joerg@mysql.com> | 2005-09-01 21:06:37 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-09-01 21:06:37 +0200 |
| commit | 9d996ad6d28950f8e4ab805e264ff8ddea1124b7 (patch) | |
| tree | b8f0559d54e73d0176b1fc8dabced773322c0a9a /Makefile.am | |
| parent | cc75310b23b0df425a81e54d84a3412a4d280612 (diff) | |
| parent | b7f1fb08f0a7a70ba5de5469c144b79a83d2cbdc (diff) | |
| download | mariadb-git-9d996ad6d28950f8e4ab805e264ff8ddea1124b7.tar.gz | |
Manual merge.
Makefile.am:
Manual merge: For "test", use Kent's new version using the Perl script with port variables,
but also have the "test-force" target (used in the RPM spec!) (still using Shell).
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 59a977a2633..ae0d56ba9fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,3 +116,8 @@ test: --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 --ps-protocol --force |