From: Daiki Ueno <dueno@redhat.com>
Date: Mon, 3 Jun 2019 01:33:05 +0000 (+0200)
Subject: tests: Skip tests calling getauxval(AT_SECURE) if binary is on /tmp
X-Git-Tag: 0.23.17~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c2022d292c00ccbe2413b53b7c91cf4ba4d7c14;p=p11-kit

tests: Skip tests calling getauxval(AT_SECURE) if binary is on /tmp
---

diff --git a/common/test-compat.c b/common/test-compat.c
index 77a0c31..8b5d2e6 100644
--- a/common/test-compat.c
+++ b/common/test-compat.c
@@ -133,8 +133,9 @@ main (int argc,
 {
 	p11_test (test_strndup, "/compat/strndup");
 #ifdef OS_UNIX
-	/* Don't run this test when under fakeroot */
-	if (!getenv ("FAKED_MODE")) {
+	/* Don't run this test when under fakeroot, or the binary is
+	 * written under /tmp */
+	if (!getenv ("FAKED_MODE") && strncmp (BUILDDIR, "/tmp/", 5) != 0) {
 		p11_test (test_getauxval, "/compat/getauxval");
 		p11_test (test_secure_getenv, "/compat/secure_getenv");
 	}
diff --git a/p11-kit/test-conf.c b/p11-kit/test-conf.c
index 94b8b01..a140aaa 100644
--- a/p11-kit/test-conf.c
+++ b/p11-kit/test-conf.c
@@ -447,8 +447,9 @@ 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
-	/* Don't run this test when under fakeroot */
-	if (!getenv ("FAKED_MODE")) {
+	/* Don't run this test when under fakeroot, or the binary is
+	 * written under /tmp */
+	if (!getenv ("FAKED_MODE") && strncmp (BUILDDIR, "/tmp/", 5) != 0) {
 		p11_test (test_setuid, "/conf/setuid");
 	}
 #endif