summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-03-28 23:08:00 +0200
committerkent@kent-amd64.(none) <>2007-03-28 23:08:00 +0200
commit054435538553552f73dce62beb4b854b1eb98870 (patch)
tree4c3aa8ce9f94908db01e0a1f2cc92620f3783d0d /support-files
parent082de779b3d58a81d09ff80a51b6b165523d8382 (diff)
parent7a2e0ee7d757d71df26c20ab23b11b61c82fd5c7 (diff)
downloadmariadb-git-054435538553552f73dce62beb4b854b1eb98870.tar.gz
Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
into mysql.com:/home/kent/bk/tmp/mysql-5.1-build
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh16
1 files changed, 2 insertions, 14 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index 0671bd8a58c..1bdab2495c2 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -337,11 +337,7 @@ then
cp -fp mysql-debug-%{mysql_version}/config.log "$MYSQL_DEBUGCONFLOG_DEST"
fi
- MTR_BUILD_THREAD=auto
- export MTR_BUILD_THREAD
-(cd mysql-debug-%{mysql_version}/mysql-test ; \
- ./mysql-test-run.pl --comment=debug --skip-rpl --skip-ndbcluster --force --report-features ; \
- true)
+(cd mysql-debug-%{mysql_version} ; make test-bt-debug)
##############################################################################
#
@@ -370,15 +366,7 @@ then
cp -fp mysql-release-%{mysql_version}/config.log "$MYSQL_CONFLOG_DEST"
fi
- MTR_BUILD_THREAD=auto
- export MTR_BUILD_THREAD
-cd mysql-release-%{mysql_version}/mysql-test
-./mysql-test-run.pl --comment=normal --force --skip-ndbcluster --timer --report-features || true
-./mysql-test-run.pl --comment=ps --ps-protocol --force --skip-ndbcluster --timer || true
-./mysql-test-run.pl --comment=normal+rowrepl --mysqld=--binlog-format=row --force --skip-ndbcluster --timer || true
-./mysql-test-run.pl --comment=ps+rowrepl+NDB --ps-protocol --mysqld=--binlog-format=row --force --timer || true
-./mysql-test-run.pl --comment=NDB --with-ndbcluster-only --force --timer || true
-cd ../..
+(cd mysql-release-%{mysql_version} ; make test-bt)
##############################################################################