From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Thu, 30 May 2019 01:29:50 +0000 (+0200)
Subject: tests: skip test-bpf only when we're 100% sure it's run in containers
X-Git-Tag: archive/raspbian/241-7_deb10u6+rpi1^2~17
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bfaad2ed5b28de773d4dfe87dc95a424b967d5de;p=systemd.git

tests: skip test-bpf only when we're 100% sure it's run in containers

This is just a follow-up to https://github.com/systemd/systemd/pull/12617.

(cherry picked from commit 6bd1457afe396864cc4b9884157a6126027ed85e)

Gbp-Pq: Name tests-skip-test-bpf-only-when-we-re-100-sure-it-s-run-in-.patch
---

diff --git a/src/test/test-bpf.c b/src/test/test-bpf.c
index eb1d8d71..9252c60e 100644
--- a/src/test/test-bpf.c
+++ b/src/test/test-bpf.c
@@ -57,7 +57,7 @@ int main(int argc, char *argv[]) {
 
         test_setup_logging(LOG_DEBUG);
 
-        if (detect_container())
+        if (detect_container() > 0)
                 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);