diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-04-10 18:08:54 +0200 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-04-10 18:08:54 +0200 |
| commit | 9f6497489110d047ac09a995e7d68878afea5482 (patch) | |
| tree | 51d0bd3e27e881f603185c3d2eddb93a795a7f24 /Makefile.am | |
| parent | f7af64abdabacff724115a1c5ddab0afeec9e47f (diff) | |
| download | mariadb-git-9f6497489110d047ac09a995e7d68878afea5482.tar.gz | |
Step 1 in removing mysql-test-run.sh from 5.1 and up
Makefile.am:
Change make test, make test-full, make test-force and make test-force-full to use mysql-test-run.pl
mysql-test/mysql-test-run.sh:
Add nag message to mysql-test-run.sh taht indicates it will soon be removed.
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 39 |
1 files changed, 11 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 3f17cbe797d..eb81344acb6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -120,53 +120,36 @@ tags: test: cd mysql-test ; \ - ./mysql-test-run --mysqld=--binlog-format=statement && \ - ./mysql-test-run --ps-protocol --mysqld=--binlog-format=row - -test-full: - cd mysql-test ; \ - ./mysql-test-run --mysqld=--binlog-format=statement && \ - ./mysql-test-run --ps-protocol --mysqld=--binlog-format=statement && \ - ./mysql-test-run --mysqld=--binlog-format=row && \ - ./mysql-test-run --ps-protocol --mysqld=--binlog-format=row - -test-force: - cd mysql-test ; \ - ./mysql-test-run --force --mysqld=--binlog-format=statement && \ - ./mysql-test-run --ps-protocol --force --mysqld=--binlog-format=row - -test-force-full: - cd mysql-test ; \ - ./mysql-test-run --force --mysqld=--binlog-format=statement && \ - ./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=statement && \ - ./mysql-test-run --force --mysqld=--binlog-format=row && \ - ./mysql-test-run --force --ps-protocol --mysqld=--binlog-format=row - -# We are testing a new Perl version of the test script -test-pl: - cd mysql-test ; \ ./mysql-test-run.pl --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row -test-full-pl: +test-full: cd mysql-test ; \ ./mysql-test-run.pl --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --mysqld=--binlog-format=row && \ ./mysql-test-run.pl --ps-protocol --mysqld=--binlog-format=row -test-force-pl: +test-force: cd mysql-test ; \ ./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --ps-protocol --force --mysqld=--binlog-format=row -test-force-full-pl: +test-force-full: cd mysql-test ; \ ./mysql-test-run.pl --force --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=statement && \ ./mysql-test-run.pl --force --mysqld=--binlog-format=row && \ ./mysql-test-run.pl --force --ps-protocol --mysqld=--binlog-format=row +# Keep these for a while +test-pl: test +test-full-pl: test-full +test-force-pl: test-force +test-force-full-pl: test-force-full + + + # Don't update the files from bitkeeper %::SCCS/s.% |