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

[Norbert Tretkowski]

tags 460402 pending
thanks

Author: nobse
Date: 2008-01-14 10:07:11 +0000 (Mon, 14 Jan 2008)
New Revision: 1121

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Run testsuite on all archs, but ignore errors on alpha, arm, armel, hppa, mipsel and sparc. (closes: #460402)


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-01-08 08:29:46 UTC (rev 1120)
+++ trunk/debian/changelog	2008-01-14 10:07:11 UTC (rev 1121)
@@ -2,8 +2,10 @@
 
   * Fix LSB header in init scripts (patch from Petter Reinholdtsen).
     (closes: #458798)
+  * Run testsuite on all archs, but ignore errors on alpha, arm, armel, hppa,
+    mipsel and sparc. (closes: #460402)
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 08 Jan 2008 09:25:23 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Mon, 14 Jan 2008 10:15:05 +0100
 
 mysql-dfsg-5.0 (5.0.51-2) unstable; urgency=low
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-01-08 08:29:46 UTC (rev 1120)
+++ trunk/debian/rules	2008-01-14 10:07:11 UTC (rev 1121)
@@ -29,8 +29,10 @@
     USE_ASSEMBLER=--enable-assembler 
 endif
 
-ifneq ($(findstring $(ARCH), alpha arm hppa mipsel sparc),$(ARCH))
-    RUN_TESTSUITE=1
+ifneq ($(findstring $(ARCH), alpha arm armel hppa mipsel sparc),)
+   TESTSUITE_FAIL_CMD=true
+else
+   TESTSUITE_FAIL_CMD=exit 1
 endif
 
 # This causes seg11 crashes if LDAP is used for groups in /etc/nsswitch.conf
@@ -122,10 +124,10 @@
 
 	$(MAKE) $(MAKE_J)
 
-	if [ "$(RUN_TESTSUITE)" == "1" ] && [ ! -f testsuite-stamp ] ; then \
+	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 ; \
+	  /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force || $(TESTSUITE_FAIL_CMD) ; \
+	  /usr/bin/perl ./mysql-test-run.pl --mysqld=--user=root --force --ps-protocol || $(TESTSUITE_FAIL_CMD) ; \
 	fi
 
 	touch testsuite-stamp