[Pkg-mysql-commits] r1066 - trunk/debian

[Norbert Tretkowski]

Author: nobse
Date: 2007-12-12 09:21:49 +0000 (Wed, 12 Dec 2007)
New Revision: 1066

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Workaround for broken testsuite when started as root.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2007-12-11 22:27:21 UTC (rev 1065)
+++ trunk/debian/changelog	2007-12-12 09:21:49 UTC (rev 1066)
@@ -6,8 +6,8 @@
   * Update patches:
     + debian/patches/41_scripts__mysql_install_db.sh__no_test.dpatch
     + debian/patches/89_ndb__staticlib.dpatch
-  * Build with gcc-4.1/g++-4.1, otherwise the (now enabled when building as
-    user != root) testsuite fails in ndb related tests.
+  * Build with gcc-4.1/g++-4.1, otherwise the (now enabled) testsuite
+    fails in ndb related tests.
   * Re-add manpages, they are licensed under GPL now and redistribution is
     permitted.
   * Drop linux-libc-dev build-dependency, it's now being pulled by libc-dev
@@ -23,7 +23,7 @@
   * Add Vcs-* and Homepage fields to source stanza in control file.
   * Update mysqlreport to 3.2 release.
 
- -- Norbert Tretkowski <nobse at debian.org>  Mon, 10 Dec 2007 13:51:58 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 12 Dec 2007 10:21:23 +0100
 
 mysql-dfsg-5.0 (5.0.45-5) UNRELEASED; urgency=high
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2007-12-11 22:27:21 UTC (rev 1065)
+++ trunk/debian/rules	2007-12-12 09:21:49 UTC (rev 1066)
@@ -117,10 +117,10 @@
 
 	$(MAKE) $(MAKE_J)
 
-	# Testsuite does not work when running as root in 5.0.51 and earlier, this
-	# bug is fixed in 5.0.52
-	if [ ! -f testsuite-stamp ] && [ "`id -u`" != "0" ] ; then \
-	  $(MAKE) test-force ; \
+	if [ ! -f testsuite-stamp ] ; then \
+	  cd mysql-test ; \
+	  /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force ; \
+	  /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force --ps-protocol ; \
 	fi
 
 	touch testsuite-stamp