summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorMatthias Leich mleich@mysql.com <Unknown>2008-06-03 12:21:48 +0200
committerMatthias Leich mleich@mysql.com <Unknown>2008-06-03 12:21:48 +0200
commit8d7fcad1967a08a1d4dda5f6084f35c4f8ae2a93 (patch)
tree1fdcef9d15d2faa857ca708ae49bacbc511c51fd /Makefile.am
parentc392457f7c234f55dfb74104771b216b15458383 (diff)
parent15440264430b8dd7c10d950926a34f8f20f14427 (diff)
downloadmariadb-git-8d7fcad1967a08a1d4dda5f6084f35c4f8ae2a93.tar.gz
Upmerge of fix for
Bug 36788 Multiple funcs_1 'trig' tests are failing on vanilla builds
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 55f54476212..fc5138e2778 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,7 +149,7 @@ test-bt:
echo "no program found for 'ndbcluster' tests - skipped testing" ; \
fi
-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 --reorder --suite=funcs_1
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=funcs2 --suite=funcs_2
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@@ -190,7 +190,7 @@ 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 --reorder --suite=funcs_1 ; \
@PERL@ ./mysql-test-run.pl --force --suite=funcs_2
test-ext-rpl: