Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Faustin Lammler
mariadb-10.1
Commits
56b22c28
Commit
56b22c28
authored
Dec 20, 2015
by
Otto Kekäläinen
Browse files
Ignore test suite exit code on unstable platforms
parent
9e2282ab
Changes
2
Hide whitespace changes
Inline
Side-by-side
debian/changelog
View file @
56b22c28
mariadb-10.0 (10.0.23-1) unstable; urgency=low
mariadb-10.0 (10.0.23-1) unstable; urgency=low
* New upstream release
* New upstream release
* Ignore test suite exit code on unstable platforms (mips, mipsel)
-- Otto Kekäläinen <otto@seravo.fi> Sun, 20 Dec 2015 14:18:33 +0200
-- Otto Kekäläinen <otto@seravo.fi> Sun, 20 Dec 2015 14:18:33 +0200
...
...
debian/rules
View file @
56b22c28
...
@@ -39,6 +39,13 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
...
@@ -39,6 +39,13 @@ ifneq (,$(filter $(ARCH), i386 kfreebsd-i386 hurd-i386))
TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
TAOCRYPT_OPT="-DTAOCRYPT_DISABLE_X86ASM"
endif
endif
# Ignore test suite exit code on unstable platforms
ifneq (,$(filter $(ARCH), mips mipsel))
TESTSUITE_FAIL_CMD:=true
else
TESTSUITE_FAIL_CMD:=exit 1
endif
# Skip TokuDB if arch is not amd64
# Skip TokuDB if arch is not amd64
ifneq ($(ARCH), amd64)
ifneq ($(ARCH), amd64)
CMAKEFLAGS += -DWITHOUT_TOKUDB=true
CMAKEFLAGS += -DWITHOUT_TOKUDB=true
...
@@ -99,7 +106,7 @@ override_dh_auto_test:
...
@@ -99,7 +106,7 @@ override_dh_auto_test:
[ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests
[ ! -f debian/unstable-tests.$(ARCH) ] || cat debian/unstable-tests.$(ARCH) >> mysql-test/unstable-tests
# Run testsuite
# Run testsuite
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
cd $(BUILDDIR)/mysql-test && ./mtr --force --testcase-timeout=30 --suite-timeout=540 --retry=3 --parallel=$(NUMJOBS) --skip-test-list=unstable-tests
cd $(BUILDDIR)/mysql-test && ./mtr --force --testcase-timeout=30 --suite-timeout=540 --retry=3 --parallel=$(NUMJOBS) --skip-test-list=unstable-tests
|| $(TESTSUITE_FAIL_CMD) ;
endif
endif
override_dh_auto_install:
override_dh_auto_install:
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment