From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 20 Dec 2019 19:37:32 +0000 (+0100)
Subject: tests: ensure test suite does not apply global config
X-Git-Tag: 3.6.12~50^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=09d4b8f2d79166e39df7e2edf69780b064d8aa6f;p=thirdparty%2Fgnutls.git

tests: ensure test suite does not apply global config

When running the test suite we do not apply the global
gnutls configration as it may change options that are
tested.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@gnutls.org>
---

diff --git a/NEWS b/NEWS
index 15e268f2f6..2e16805007 100644
--- a/NEWS
+++ b/NEWS
@@ -21,7 +21,8 @@ See the end for copying conditions.
    TLS 1.3 in setups where GOST ciphersuites are enabled on GnuTLS-based servers.
 
 ** libgnutls: The min-verification-profile from system configuration applies
-   for all certificate verifications, not only under TLS.
+   for all certificate verifications, not only under TLS. The configuration can
+   be overriden using the GNUTLS_SYSTEM_PRIORITY_FILE environment variable.
 
 ** certtool: Added the --verify-profile option to set a certificate
    verification profile. Use '--verify-profile low' for certificate verification
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 862557b5a3..76765889c6 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -149,6 +149,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	ac_cv_sizeof_time_t="$(ac_cv_sizeof_time_t)" \
 	ASAN_OPTIONS="detect_leaks=0:exitcode=6" \
 	GNUTLS_TEST_SUITE_RUN=1			\
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/../system.prio \
 	srcdir="$(srcdir)"
 
 if ENABLE_FIPS140
diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am
index b4c43c6aa3..9418985d97 100644
--- a/tests/slow/Makefile.am
+++ b/tests/slow/Makefile.am
@@ -67,6 +67,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	LSAN_OPTIONS=suppressions=gnutls-asan.supp		\
 	GNUTLS_TEST_SUITE_RUN=1					\
 	OPENSSL_ia32cap=0x00000000				\
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/../system.prio	\
 	top_builddir="$(top_builddir)"				\
 	srcdir="$(srcdir)"
 
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index 21966ac898..fd8fac7919 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -103,6 +103,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	srcdir="$(srcdir)"		\
 	ASAN_OPTIONS="detect_leaks=0"	\
 	GNUTLS_TEST_SUITE_RUN=1		\
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/../system.prio \
 	OPENSSL_ia32cap=0x00000000
 
 if ENABLE_NON_SUITEB_CURVES
diff --git a/tests/windows/Makefile.am b/tests/windows/Makefile.am
index 5a81043772..1d238d23f2 100644
--- a/tests/windows/Makefile.am
+++ b/tests/windows/Makefile.am
@@ -68,8 +68,9 @@ TESTS = $(ctests) $(dist_check_SCRIPTS)
 
 TESTS_ENVIRONMENT =						\
 	WINEDLLOVERRIDES="crypt32=n,ncrypt=n"			\
-	LC_ALL="C"						\
+	LC_ALL="C"				\
 	GNUTLS_TEST_SUITE_RUN=1			\
-	EXEEXT=$(EXEEXT)					\
-	top_builddir="$(top_builddir)"				\
+	EXEEXT=$(EXEEXT)			\
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/../system.prio \
+	top_builddir="$(top_builddir)"		\
 	srcdir="$(srcdir)"