diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-13 19:19:02 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-13 19:19:02 +0100 |
| commit | 2df738f3d0931cafcf020e7a145a5f1b90f24dba (patch) | |
| tree | 7604dd7ebd963f098c132cb934eec482d913f9da /Makefile.am | |
| parent | b727e09ce3e60aa8f84522d843e742dba9181421 (diff) | |
| parent | 1eb70558efbc61313ee0892e369343915b653ea6 (diff) | |
| download | mariadb-git-2df738f3d0931cafcf020e7a145a5f1b90f24dba.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
into neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
mysql-test/Makefile.am:
Auto merged
mysql-test/mysql-test-run-shell.sh:
Auto merged
Makefile.am:
Manual merge
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.% |