From daff133ddf9a9d120050703c0b5753979c6190e0 Mon Sep 17 00:00:00 2001
From: Sergey Vojtovich <svoj@mariadb.org>
Date: Thu, 18 Aug 2016 12:47:20 +0400
Subject: MDEV-9185 - Integrate with Travis-CI for easier and more automatic QA
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Based on contributions by Daniel Black and Otto Kekäläinen.
---
 debian/rules | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'debian/rules')

diff --git a/debian/rules b/debian/rules
index 7f134af24a8..2591e0070a4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,20 +29,15 @@ ifeq (${MAKE_J}, -j0)
   MAKE_J = -j1
 endif
 
-MAKE_TEST_TARGET=test-force
-ifneq ($(findstring fulltest,$(DEB_BUILD_OPTIONS)),)
-# make test-bt is the testsuite run by the MySQL build team 
-# before a release, but it is long
-    MAKE_TEST_TARGET=test-bt
+# Parallel build support as advised
+# at https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+    MAKEFLAGS += -j $(NUMJOBS)
 endif
 
-USE_ASSEMBLER=--enable-assembler 
 
-ifneq (,$(filter $(ARCH), amd64 i386 ia64 s390))
-    TESTSUITE_FAIL_CMD=exit 1
-else
-    TESTSUITE_FAIL_CMD=true
-endif
+USE_ASSEMBLER=--enable-assembler
 
 BUILDDIR = builddir
 builddir = $(BUILDDIR)
@@ -88,7 +83,7 @@ build-stamp: configure
 
 ifeq ($(findstring nocheck,$(DEB_BUILD_OPTIONS)),)
 	if [ ! -f testsuite-stamp ] ; then \
-	  cd $(builddir) && $(MAKE) $(MAKE_TEST_TARGET) || $(TESTSUITE_FAIL_CMD) ; \
+	  cd $(builddir)/mysql-test && ./mtr --force --parallel=$(NUMJOBS) --skip-rpl --suite=main; \
 	fi
 endif
 
-- 
cgit v1.2.1