From: Wolfgang Bumiller Date: Thu, 25 May 2023 12:04:57 +0000 (+0200) Subject: skip userns tests in sbuild environment X-Git-Url: https://git.proxmox.com/?p=pve-container.git;a=commitdiff_plain;h=0d802f789bb51e22a058b07979cd56dfe70c2750 skip userns tests in sbuild environment Since they cannot run in a chroot. They'd need a `pivot_root` environment instead. Signed-off-by: Wolfgang Bumiller --- diff --git a/src/test/Makefile b/src/test/Makefile index 82e8967..91ae6ff 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -5,13 +5,21 @@ all: test test: test_setup test_snapshot test_bindmount test_idmap test_setup: run_setup_tests.pl - $(RUN_USERNS) ./run_setup_tests.pl + if test -e /run/lock/sbuild; then \ + echo skipping userns tests in sbuild environment ; \ + else \ + $(RUN_USERNS) ./run_setup_tests.pl ; \ + fi test_snapshot: run_snapshot_tests.pl ./run_snapshot_tests.pl test_bindmount: bindmount_test.pl - $(RUN_USERNS) ./bindmount_test.pl + if test -e /run/lock/sbuild; then \ + echo skipping userns tests in sbuild environment ; \ + else \ + $(RUN_USERNS) ./bindmount_test.pl ; \ + fi test_idmap: run_idmap_tests.pl ./run_idmap_tests.pl