diff options
| -rw-r--r-- | src/test/test-bpf.c | 5 | ||||
| -rwxr-xr-x | travis-ci/managers/debian.sh | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c index b09e8c714c..f4d0c731f1 100644 --- a/src/test/test-bpf.c +++ b/src/test/test-bpf.c @@ -14,6 +14,7 @@ #include "test-helper.h" #include "tests.h" #include "unit.h" +#include "virt.h" /* We use the same limit here that PID 1 bumps RLIMIT_MEMLOCK to if it can */ #define CAN_MEMLOCK_SIZE (64U*1024U*1024U) @@ -56,8 +57,8 @@ int main(int argc, char *argv[]) { test_setup_logging(LOG_DEBUG); - if (is_run_on_travis_ci()) - return log_tests_skipped("test-bpf fails on Travis CI: https://github.com/systemd/systemd/issues/9666"); + if (detect_container()) + return log_tests_skipped("test-bpf fails inside LXC and Docker containers: https://github.com/systemd/systemd/issues/9666"); assert_se(getrlimit(RLIMIT_MEMLOCK, &rl) >= 0); rl.rlim_cur = rl.rlim_max = MAX3(rl.rlim_cur, rl.rlim_max, CAN_MEMLOCK_SIZE); diff --git a/travis-ci/managers/debian.sh b/travis-ci/managers/debian.sh index dd9b816c98..95f34cf8fa 100755 --- a/travis-ci/managers/debian.sh +++ b/travis-ci/managers/debian.sh @@ -35,7 +35,7 @@ for phase in "${PHASES[@]}"; do info "Using Debian $DEBIAN_RELEASE" printf "FROM debian:$DEBIAN_RELEASE\nRUN bash -c 'apt-get -y update && apt-get install -y systemd'\n" | docker build -t debian-with-systemd/latest - info "Starting container $CONT_NAME" - $DOCKER_RUN -v $REPO_ROOT:/build:rw \ + $DOCKER_RUN -v $REPO_ROOT:/build:rw -e container=docker \ -w /build --privileged=true --name $CONT_NAME \ -dit --net=host debian-with-systemd/latest /bin/systemd $DOCKER_EXEC bash -c "echo deb-src http://deb.debian.org/debian $DEBIAN_RELEASE main >>/etc/apt/sources.list" |