Disable tests with setgid binaries when running in fakeroot

We use the FAKED_MODE environment variable as a way to detect
fakeroot.

diff --git a/common/tests/test-compat.c b/common/tests/test-compat.c
index c73c034e987ef6d5390bad6718a95b3a14edd048..872170d43e7eed1dc4359e50642fc51c249e9769 100644 (file)
--- a/common/tests/test-compat.c
+++ b/common/tests/test-compat.c
@@ -91,7 +91,10 @@ main (int argc,
 {
        p11_test (test_strndup, "/compat/strndup");
 #ifdef OS_UNIX
-       p11_test (test_getauxval, "/compat/getauxval");
+       /* Don't run this test when under fakeroot */
+       if (!getenv ("FAKED_MODE")) {
+               p11_test (test_getauxval, "/compat/getauxval");
+       }
 #endif
        return p11_test_run (argc, argv);
 }

diff --git a/p11-kit/tests/test-conf.c b/p11-kit/tests/test-conf.c
index dc82da8679474fa24a095ec33981efd3d3c8e4ee..d5dc41511f2dd0202518eeb5e180b238e7f06b21 100644 (file)
--- a/p11-kit/tests/test-conf.c
+++ b/p11-kit/tests/test-conf.c
@@ -447,7 +447,10 @@ main (int argc,
        p11_test (test_load_modules_user_none, "/conf/test_load_modules_user_none");
        p11_test (test_parse_boolean, "/conf/test_parse_boolean");
 #ifdef OS_UNIX
-       p11_test (test_setuid, "/conf/setuid");
+       /* Don't run this test when under fakeroot */
+       if (!getenv ("FAKED_MODE")) {
+               p11_test (test_setuid, "/conf/setuid");
+       }
 #endif
        return p11_test_run (argc, argv);
 }