summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames P. Harvey2019-02-21 18:27:39 -0500
committerJames P. Harvey2019-02-21 20:09:20 -0500
commit0135615d8015f1296643dd60470da3a84a67f845 (patch)
treee508518d65553fc2bf335054d3ff835f1abf7cb1
parente07eb6dc3f92ce7b5d658dfa392fe42613cf396c (diff)
downloadaur-0135615d8015f1296643dd60470da3a84a67f845.tar.gz
Require unittests pass. If running through devtools, disable unittests using mlock() which fail within systemd-nspawn. The mlock() failure and allowing unittests to fail dates back to around 3.6.0-1, and they were disabled entirely in 3.4.9-1.
-rw-r--r--PKGBUILD18
1 files changed, 16 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 15607ae1b152..c62ba5ccec7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -72,9 +72,23 @@ check() {
export SCONSFLAGS="$MAKEFLAGS"
- # 3.6.0: mlock permission denied
scons unittests "${_scons_args[@]}"
- python2 "${srcdir}/${pkgname}-src-r${pkgver}/buildscripts/resmoke.py" --suites=unittests || warning "Tests failed"
+
+ # These use mlock(), which will fail under systemd-nspawn (using devtools)
+ # See https://jira.mongodb.org/browse/SERVER-32773
+ # "systemd-detect-virt" outputs "systemd-nspawn" as root, but "none" as builduser
+ if [[ -f /chrootbuild ]]; then
+ sed -i "/build\/opt\/mongo\/base\/secure_allocator_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/crypto\/mechanism_scram_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/db\/auth\/authorization_manager_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/db\/auth\/authorization_session_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/db\/auth\/sasl_mechanism_registry_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/db\/auth\/sasl_scram_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/db\/auth\/user_document_parser_test/d" build/unittests.txt
+ sed -i "/build\/opt\/mongo\/db\/logical_session_id_test/d" build/unittests.txt
+ fi
+
+ python2 "${srcdir}/${pkgname}-src-r${pkgver}/buildscripts/resmoke.py" --suites=unittests
scons dbtest "${_scons_args[@]}"
python2 "${srcdir}/${pkgname}-src-r${pkgver}/buildscripts/resmoke.py" --suites=dbtest