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

[Norbert Tretkowski]

Author: nobse
Date: 2008-02-06 10:58:34 +0000 (Wed, 06 Feb 2008)
New Revision: 1141

Modified:
   trunk/debian/changelog
   trunk/debian/rules
Log:
Support DEB_BUILD_OPTIONS option 'nocheck' to skip tests.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-05 16:03:57 UTC (rev 1140)
+++ trunk/debian/changelog	2008-02-06 10:58:34 UTC (rev 1141)
@@ -8,18 +8,19 @@
     + debian/patches/92_SECURITY_CVE-2007-6303.dpatch
     + debian/patches/93_SECURITY_CVE-2007-6304.dpatch
     + debian/patches/94_SECURITY_CVE-2008-0226+0227.dpatch
+  * Add recommendation on libhtml-template-perl to -server package, used by
+    ndb_size. (closes: #462265)
   * New patch 60_raise-max-keylength.dpatch to raise the maximum key length to
     4005 bytes or 1335 UTF-8 characters. (closes: #463137)
   * New patch 51_sort-order.dpatch from 5.0.52 to fix incorrect order when
     using range conditions on 2 tables or more.
-  * Add recommendation on libhtml-template-perl to -server package, used by
-    ndb_size. (closes: #462265)
+  * Support DEB_BUILD_OPTIONS option 'nocheck' to skip tests.
   * Update mysqlreport to 3.4a release.
 
   [ Luk Claes ]
   * Updated Japanese debconf translation. (closes: #462158)
 
- -- Norbert Tretkowski <nobse at debian.org>  Tue, 05 Feb 2008 17:01:14 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 06 Feb 2008 11:57:45 +0100
 
 mysql-dfsg-5.0 (5.0.51-3) unstable; urgency=high
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-02-05 16:03:57 UTC (rev 1140)
+++ trunk/debian/rules	2008-02-06 10:58:34 UTC (rev 1141)
@@ -124,11 +124,13 @@
 
 	$(MAKE) $(MAKE_J)
 
-	if [ ! -f testsuite-stamp ] ; then \
-	  cd mysql-test ; \
-	  /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
+	ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
+	  if [ ! -f testsuite-stamp ] ; then \
+	    cd mysql-test ; \
+	    /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
+	endif
 
 	touch testsuite-stamp