[Pkg-mysql-commits] r1057 - branches/sid-5.0/debian

[Norbert Tretkowski]

Author: nobse
Date: 2007-12-10 13:09:51 +0000 (Mon, 10 Dec 2007)
New Revision: 1057

Modified:
   branches/sid-5.0/debian/changelog
   branches/sid-5.0/debian/rules
Log:
Don't run the testsuite when building as root.

Modified: branches/sid-5.0/debian/changelog
===================================================================
--- branches/sid-5.0/debian/changelog	2007-12-10 10:18:20 UTC (rev 1056)
+++ branches/sid-5.0/debian/changelog	2007-12-10 13:09:51 UTC (rev 1057)
@@ -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) testsuite fails in
-    many testcases.
+  * Build with gcc-4.1/g++-4.1, otherwise the (now enabled when building as
+    user != root) 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 11:11:31 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 10 Dec 2007 13:51:58 +0100
 
 mysql-dfsg-5.0 (5.0.45-4) unstable; urgency=high
 

Modified: branches/sid-5.0/debian/rules
===================================================================
--- branches/sid-5.0/debian/rules	2007-12-10 10:18:20 UTC (rev 1056)
+++ branches/sid-5.0/debian/rules	2007-12-10 13:09:51 UTC (rev 1057)
@@ -117,7 +117,7 @@
 
 	$(MAKE) $(MAKE_J)
 
-	if [ ! -f testsuite-stamp ]; then \
+	if [ ! -f testsuite-stamp ] && [ "`id -u`" != "0" ] ; then \
 	  cd mysql-test ; \
 	  /usr/bin/perl ./mysql-test-run.pl --force ; \
 	fi