[Pkg-mysql-commits] r1158 - in trunk: . debian

[Monty Taylor]

Author: mtaylor-guest
Date: 2008-02-20 15:18:36 +0000 (Wed, 20 Feb 2008)
New Revision: 1158

Modified:
   trunk/
   trunk/debian/changelog
   trunk/debian/rules
Log:
* Replaced direct calls to test suite with calls to the make targets used by
  the MySQL build and qa teams for releases.


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2008-02-19 16:14:34.723000050 -0300
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

   + timestamp: 2008-02-19 16:14:53.823999882 -0300
committer: Monty Taylor <monty at inaugust.com>
properties: 
	branch-nick: trunk

Name: bzr:revision-id:v3-trunk0
   - 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21

   + 588 monty at inaugust.com-20071218115655-e9a3qdeanxkm37q0
589 monty at inaugust.com-20071219010144-z07rx72f4aryuxd5
590 monty at inaugust.com-20071219010251-1xj8ebk20xcavzzz
591 monty at inaugust.com-20071219133703-cfc7gcr1mfrbff5k
594 monty at inaugust.com-20071219160333-4t3d5sm5ou2cnx42
600 monty at inaugust.com-20071227231232-38mmb4bf89bai9tz
601 monty at inaugust.com-20071227231533-6u75bgvr52589l9d
602 monty at inaugust.com-20071227232516-5e1uuemjok6gax36
603 monty at inaugust.com-20071227232613-mvmphhlfm3ucfjre
604 monty at inaugust.com-20071227232728-26ik99mzw0yhq4vi
605 monty at inaugust.com-20071227234930-zlri2er7sq9obnot
606 monty at inaugust.com-20071228004201-2uib1ipksw8yeodu
607 monty at inaugust.com-20080218183922-0rfctqrxnkvqirvz
608 monty at inaugust.com-20080218184224-jq7u016hfc6gvt16
609 monty at inaugust.com-20080218191319-s202z6cpd2wkk6mx
610 monty at inaugust.com-20080218193205-41o5j3pbcsjpnwhp
611 monty at inaugust.com-20080219191434-rk81tk20rs716j21
612 monty at inaugust.com-20080219191453-lt7mlbmdj6vqmv2z


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-02-20 15:18:33 UTC (rev 1157)
+++ trunk/debian/changelog	2008-02-20 15:18:36 UTC (rev 1158)
@@ -6,8 +6,10 @@
   * Replaced script in check_for_crashed_tables with a myisam-recover option
     and a script to trigger a check of those tables.
     (thanks HarrisonF and kolbe)
+  * Replaced direct calls to test suite with calls to the make targets used by
+    the MySQL build and qa teams for releases.
 
- -- Monty Taylor <mtaylor at mysql.com>  Tue, 19 Feb 2008 15:32:31 -0300
+ -- Monty Taylor <mtaylor at mysql.com>  Tue, 19 Feb 2008 16:14:38 -0300
 
 mysql-dfsg-5.0 (5.0.51a-3) unstable; urgency=low
 

Modified: trunk/debian/rules
===================================================================
--- trunk/debian/rules	2008-02-20 15:18:33 UTC (rev 1157)
+++ trunk/debian/rules	2008-02-20 15:18:36 UTC (rev 1158)
@@ -25,6 +25,13 @@
   MAKE_J = -j1
 endif
 
+MAKE_TEST_TARGET=test
+ifneq ($(findstring $(DEB_BUILD_OPTIONS),fulltest),)
+# make test-bt is the testsuite run by the MySQL build team 
+# before a release, but it is long
+    MAKE_TEST_TARGET=test-bt
+endif
+
 ifeq ($(findstring $(ARCH),i386 sparc),$(ARCH))
     USE_ASSEMBLER=--enable-assembler 
 endif
@@ -125,11 +132,9 @@
 
 	$(MAKE) $(MAKE_J)
 
-ifeq ($(findstring $(DEB_BUILD_OPTIONS),nocheck),)
+ifneq ($(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) ; \
+		$(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
 	fi
 endif