diff options
| author | unknown <joerg@debian.(none)> | 2007-12-11 20:47:31 +0100 |
|---|---|---|
| committer | unknown <joerg@debian.(none)> | 2007-12-11 20:47:31 +0100 |
| commit | 97dc5387c69d3eb2d914475beb7373fc999e044d (patch) | |
| tree | 20b3f7d06fb91c2f0c13a16b0b3d45258ef811e6 /Makefile.am | |
| parent | 9e5ed26076c1999f4437eca4a7ef133962f2e30f (diff) | |
| parent | af868ba7ce9d85bc17c8fc6445146bff5e05413c (diff) | |
| download | mariadb-git-97dc5387c69d3eb2d914475beb7373fc999e044d.tar.gz | |
Merge debian.(none):/MySQL/M50/indent-5.0
into debian.(none):/MySQL/M50/push-5.0
Makefile.am:
Auto merged
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/Makefile.am b/Makefile.am index 52a9dcbd389..eb837b1fdd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -127,11 +127,11 @@ tags: test-ps: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol + @PERL@ ./mysql-test-run.pl $(force) $(mem) --ps-protocol test-ns: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(force) $(mem) + @PERL@ ./mysql-test-run.pl $(force) $(mem) test: test-ns test-ps @@ -150,25 +150,25 @@ test-force-mem: test-bt: -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=normal --report-features + @PERL@ ./mysql-test-run.pl --force --comment=normal --report-features -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol + @PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1 + @PERL@ ./mysql-test-run.pl --force --comment=funcs1_ps --ps-protocol --suite=funcs_1 -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2 + @PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2 -if [ -d mysql-test/suite/nist ] ; then \ - cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \ + cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=NIST+normal --force --suite=nist ; \ fi -if [ -d mysql-test/suite/nist ] ; then \ - cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \ + cd mysql-test ; MTR_BUILD_THREAD=auto \ + @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \ fi test-bt-debug: -cd mysql-test ; MTR_BUILD_THREAD=auto \ - @PERL@ ./mysql-test-run.pl --force --comment=debug --report-features + @PERL@ ./mysql-test-run.pl --force --comment=debug --report-features # Keep these for a while test-pl: test @@ -179,15 +179,15 @@ test-force-full-pl: test-force-full test-ext-funcs: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \ - @PERL@ ./mysql-test-run.pl --force --suite=funcs_2 + @PERL@ ./mysql-test-run.pl --force --suite=funcs_1 ; \ + @PERL@ ./mysql-test-run.pl --force --suite=funcs_2 test-ext: test-ext-funcs test-fast: cd mysql-test ; \ - @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \ - @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam + @PERL@ ./mysql-test-run.pl $(subset) --force --skip-ndb --skip-innodb --skip-im --skip-rpl ; \ + @PERL@ ./mysql-test-run.pl $(subset) --force --suite=funcs_1 --do-test=myisam test-fast-view: $(MAKE) subset=--view-protocol test-fast @@ -200,8 +200,8 @@ test-fast-prepare: test-full-qa: $(MAKE) force=--force test-pl \ - test-ext test-fast-view \ - test-fast-cursor + test-ext test-fast-view \ + test-fast-cursor # Don't update the files from bitkeeper %::SCCS/s.% |