tests: skip ctrlchannel and ctrlchannel2 in sbuild

fails with some odd "still running error", but only if the unshare
mode is used.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/tests/test_ctrlchannel b/tests/test_ctrlchannel
index 40e0bc83d558db294857f51f394f73f93e44cfb8..8a74b1382671871b158c051d47e75b380412695e 100755 (executable)
--- a/tests/test_ctrlchannel
+++ b/tests/test_ctrlchannel
@@ -2,6 +2,11 @@
 
 # For the license, see the LICENSE file in the root directory.
 
+if [ -e /run/lock/sbuild ]; then
+    echo "building in sbuild, avoid potential (unshare) problematic test"
+    exit 77
+fi
+
 ROOT=${abs_top_builddir:-$(dirname "$0")/..}
 TESTDIR=${abs_top_testdir:-$(dirname "$0")}
 
@@ -34,7 +39,6 @@ skip_test_no_tpm12 "${SWTPM_EXE}"
 
 # OS X would not allow nobody to access the $TPMDIR easily; skip it
 if [ $(id -u) -eq 0 ] && [ "$(uname -s)" != "Darwin" ]; then
-       FOWNER=",uid=nobody,gid=$(id -Gn nobody | cut -d" " -f1)"
        FILEOWNER="$(id -u nobody) $(id -G nobody | cut -d" " -f1)"
        RUNAS="--runas nobody"
        chown nobody $TPMDIR

diff --git a/tests/test_ctrlchannel2 b/tests/test_ctrlchannel2
index 43c2b11faa292e7a5525aa4b7d8a0f74e5ddd0bb..f292699006066a6370dd35d821cc999febbee588 100755 (executable)
--- a/tests/test_ctrlchannel2
+++ b/tests/test_ctrlchannel2
@@ -2,6 +2,11 @@
 
 # For the license, see the LICENSE file in the root directory.
 
+if [ -e /run/lock/sbuild ]; then
+    echo "building in sbuild, avoid potential (unshare) problematic test"
+    exit 77
+fi
+
 ROOT=${abs_top_builddir:-$(dirname "$0")/..}
 TESTDIR=${abs_top_testdir:-$(dirname "$0")}