From 9103671d7c2af8ff613b0eaefbb4931ea8021aee Mon Sep 17 00:00:00 2001 From: Evgeny Vereshchagin Date: Sun, 23 Dec 2018 14:28:01 +0100 Subject: [PATCH] test: don't run TEST-01-BASIC in unprivileged containers on Travis CI --- test/TEST-01-BASIC/test.sh | 2 +- travis-ci/managers/xenial.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh index 1d2f8334787..d74a2e00c1d 100755 --- a/test/TEST-01-BASIC/test.sh +++ b/test/TEST-01-BASIC/test.sh @@ -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 diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/xenial.sh index 06e3c0a2301..c854e681b0a 100755 --- a/travis-ci/managers/xenial.sh +++ b/travis-ci/managers/xenial.sh @@ -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 -- 2.39.2