diff options
| author | msvensson@neptunus.(none) <> | 2006-11-13 19:19:02 +0100 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-11-13 19:19:02 +0100 |
| commit | 0b60b7d59af12f4b45b59385fb5c26709161ec39 (patch) | |
| tree | 7604dd7ebd963f098c132cb934eec482d913f9da /Makefile.am | |
| parent | f105e0ecd08b4717bcc20bb80dea84c5a608e301 (diff) | |
| parent | e09df84aa58890c9030d1f77bc8ded40edd30b0f (diff) | |
| download | mariadb-git-0b60b7d59af12f4b45b59385fb5c26709161ec39.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 3 insertions, 15 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.% |