]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
test: don't run TEST-01-BASIC in unprivileged containers on Travis CI
authorEvgeny Vereshchagin <evvers@ya.ru>
Sun, 23 Dec 2018 13:28:01 +0000 (14:28 +0100)
committerEvgeny Vereshchagin <evvers@ya.ru>
Mon, 24 Dec 2018 07:52:33 +0000 (08:52 +0100)
test/TEST-01-BASIC/test.sh
travis-ci/managers/xenial.sh

index 1d2f833478706bbcf4263c67f3032064f4227915..d74a2e00c1d5ec0c77c9310abc82d7d75c126efb 100755 (executable)
@@ -3,7 +3,7 @@
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 set -e
 TEST_DESCRIPTION="Basic systemd setup"
-RUN_IN_UNPRIVILEGED_CONTAINER=yes
+RUN_IN_UNPRIVILEGED_CONTAINER=${RUN_IN_UNPRIVILEGED_CONTAINER:-yes}
 
 . $TEST_BASE_DIR/test-functions
 
index 06e3c0a23013f47cae09955044f5e066139688be..c854e681b0a088ea213db457a88415db10c3583d 100755 (executable)
@@ -16,4 +16,4 @@ sed -i 's/2\.30/2.27/' meson.build
 
 meson --werror -Db_sanitize=address,undefined -Dsplit-usr=true build
 ninja -v -C build
-make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit
+make -C test/TEST-01-BASIC clean setup run TEST_NO_QEMU=yes NSPAWN_ARGUMENTS=--keep-unit RUN_IN_UNPRIVILEGED_CONTAINER=no