diff options
| author | Otto Kekäläinen <otto@seravo.fi> | 2015-11-10 22:58:56 +0200 |
|---|---|---|
| committer | Otto Kekäläinen <otto@mariadb.org> | 2015-11-23 17:24:11 +0200 |
| commit | 67125f035af0245c1130ef92c0ebc655a7d1e4e0 (patch) | |
| tree | cfdabd71c04dbacf2a93acce2de32aa805cc4be1 | |
| parent | b27c425a37190cfc534227fbfd9ccce3ddcf0bff (diff) | |
| download | mariadb-git-67125f035af0245c1130ef92c0ebc655a7d1e4e0.tar.gz | |
Parallelize the test suite run in Debian build
| -rwxr-xr-x | debian/rules | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/debian/rules b/debian/rules index 7f134af24a8..a9e383cb2e1 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 --parallel=$(NUMJOBS); \ fi endif |