2004-12-21 21:02:47 +00:00
|
|
|
This patch is needed to improve the probability that the MySQL tests pass
|
|
|
|
|
in Red Hat's build environment. The 32-bit and 64-bit variants of a single
|
|
|
|
|
architecture may be built on the same machine at the same time, so we have
|
|
|
|
|
to ensure that the tests use different port numbers on a 64-bit arch than
|
2005-04-08 00:02:33 +00:00
|
|
|
on a 32-bit, else they will interfere with each other.
|
2004-12-21 21:02:47 +00:00
|
|
|
|
2005-11-03 04:05:15 +00:00
|
|
|
We also have to hack the top-level Makefile to enable the openssl regression
|
|
|
|
|
tests. (Why doesn't this happen automatically given the configure option??)
|
2004-12-21 21:02:47 +00:00
|
|
|
|
2005-11-03 04:05:15 +00:00
|
|
|
Note: keep an eye on which version of "mysql-test-run" gets invoked by
|
|
|
|
|
the "make test" target. In the 4.1 branch this is now defaulting to the
|
|
|
|
|
perl script, but 5.0 is not (yet?) doing that; they also seem to be fooling
|
|
|
|
|
with a C-code version. Besides this patch, mysql-libtool.patch
|
|
|
|
|
would need to be changed to use either one.
|
|
|
|
|
|
|
|
|
|
|
2005-12-10 05:13:43 +00:00
|
|
|
diff -Naur mysql-5.0.16.orig/Makefile.am mysql-5.0.16/Makefile.am
|
|
|
|
|
--- mysql-5.0.16.orig/Makefile.am 2005-11-14 19:12:31.000000000 -0500
|
|
|
|
|
+++ mysql-5.0.16/Makefile.am 2005-12-09 18:29:31.000000000 -0500
|
|
|
|
|
@@ -107,8 +107,8 @@
|
2005-11-03 04:05:15 +00:00
|
|
|
|
|
|
|
|
test:
|
|
|
|
|
cd mysql-test ; \
|
2005-12-10 05:13:43 +00:00
|
|
|
- ./mysql-test-run && \
|
|
|
|
|
- ./mysql-test-run --ps-protocol
|
|
|
|
|
+ ./mysql-test-run --with-openssl && \
|
|
|
|
|
+ ./mysql-test-run --ps-protocol --with-openssl
|
2004-12-21 21:02:47 +00:00
|
|
|
|
2005-12-10 05:13:43 +00:00
|
|
|
test-force:
|
|
|
|
|
cd mysql-test; \
|
|
|
|
|
diff -Naur mysql-5.0.16.orig/mysql-test/mysql-test-run.sh mysql-5.0.16/mysql-test/mysql-test-run.sh
|
|
|
|
|
--- mysql-5.0.16.orig/mysql-test/mysql-test-run.sh 2005-11-14 19:12:46.000000000 -0500
|
|
|
|
|
+++ mysql-5.0.16/mysql-test/mysql-test-run.sh 2005-12-09 18:34:09.000000000 -0500
|
|
|
|
|
@@ -222,6 +222,16 @@
|
|
|
|
|
# an environment variable can be used to control all ports. A small
|
|
|
|
|
# number is to be used, 0 - 16 or similar.
|
|
|
|
|
#
|
2004-12-21 21:02:47 +00:00
|
|
|
+# hack to allow 32- and 64-bit tests to run concurrently on same build machine
|
|
|
|
|
+case `uname -m` in
|
|
|
|
|
+ ppc64 | s390x | x86_64)
|
2005-12-10 05:13:43 +00:00
|
|
|
+ MTR_BUILD_THREAD=7
|
2004-12-21 21:02:47 +00:00
|
|
|
+ ;;
|
|
|
|
|
+ *)
|
2005-12-10 05:13:43 +00:00
|
|
|
+ MTR_BUILD_THREAD=11
|
2004-12-21 21:02:47 +00:00
|
|
|
+ ;;
|
|
|
|
|
+esac
|
2005-12-10 05:13:43 +00:00
|
|
|
+
|
|
|
|
|
if [ -n "$MTR_BUILD_THREAD" ] ; then
|
|
|
|
|
MASTER_MYPORT=`expr $MTR_BUILD_THREAD '*' 5 + 10000`
|
|
|
|
|
MYSQL_MANAGER_PORT=`expr $MASTER_MYPORT + 2`
|
