diff options
| author | msvensson@neptunus.(none) <> | 2006-04-11 09:11:36 +0200 |
|---|---|---|
| committer | msvensson@neptunus.(none) <> | 2006-04-11 09:11:36 +0200 |
| commit | 8fe764fbb200472ce37cd4fef8aa401f1b1d0dbc (patch) | |
| tree | 250fa4de80754cf9f63a1956c34e9cd17e8ee3b1 /Makefile.am | |
| parent | e9ef9ef6daa8d9643cf3a78864cc19069fdec458 (diff) | |
| parent | e805afde11a18c55f9a86ad1e07f80d33f26a29e (diff) | |
| download | mariadb-git-8fe764fbb200472ce37cd4fef8aa401f1b1d0dbc.tar.gz | |
Merge bk-internal:/home/bk/mysql-5.1-new
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
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 81146f9aa82..4e648dabe27 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.% |