summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <joerg@trift2.>2006-11-15 20:34:44 +0100
committerunknown <joerg@trift2.>2006-11-15 20:34:44 +0100
commit4c3392e351a5f55a4fd0a46c593f301d52ba55de (patch)
tree8a898bf06e6ffb063ee1784e720b16692ec5d387 /support-files
parentd8ff3e7baff940ac2cf3f5014d99fb9fe0f535cd (diff)
parent5363ec5275b0087ecbbe86b5e9ae9e7cb0229795 (diff)
downloadmariadb-git-4c3392e351a5f55a4fd0a46c593f301d52ba55de.tar.gz
Merge trift2.:/MySQL/M41/spec-mtr-4.1
into trift2.:/MySQL/M50/spec-mtr-5.0 support-files/mysql.spec.sh: Use "report features" (manual merge).
Diffstat (limited to 'support-files')
-rw-r--r--support-files/mysql.spec.sh15
1 files changed, 13 insertions, 2 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh
index eefc4f55d35..33398707b94 100644
--- a/support-files/mysql.spec.sh
+++ b/support-files/mysql.spec.sh
@@ -342,7 +342,10 @@ then
cp -fp config.log "$MYSQL_MAXCONFLOG_DEST"
fi
-make -i test-force-pl || true
+( cd mysql-test
+ perl ./mysql-test-run.pl --force --report-features
+ perl ./mysql-test-run.pl --force --ps-protocol
+ true )
# Save mysqld-max
./libtool --mode=execute cp sql/mysqld sql/mysqld-max
@@ -401,7 +404,10 @@ then
cp -fp config.log "$MYSQL_CONFLOG_DEST"
fi
-make -i test-force-pl || true
+( cd mysql-test
+ perl ./mysql-test-run.pl --force --report-features
+ perl ./mysql-test-run.pl --force --ps-protocol
+ true )
%install
RBR=$RPM_BUILD_ROOT
@@ -745,6 +751,11 @@ fi
# itself - note that they must be ordered by date (important when
# merging BK trees)
%changelog
+* Wed Nov 15 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Switch from "make test*" to explicit calls of the test suite,
+ so that "report features" can be used.
+
* Mon Jul 10 2006 Joerg Bruehe <joerg@mysql.com>
- Fix a typing error in the "make" target for the Perl script to run the tests.