From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Mon, 6 Jan 2020 09:41:27 +0000 (+0000)
Subject: tests/Makefile.am: use absolute top_srcdir for GNUTLS_PRIORITY_FILE
X-Git-Tag: 3.6.12~33^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=85e76bbd10d9ca481c2396eaab61ea70f49d23ac;p=thirdparty%2Fgnutls.git

tests/Makefile.am: use absolute top_srcdir for GNUTLS_PRIORITY_FILE

Some tests, e.g. in suite/tls-fuzzer execute scripts from
sub-directories, making the relative path to system.prio in the
environment pointing to a non-existent file. Export system.prio
testsuite file as an absolute path to avoid this issue.

Signed-off-by: Dimitri John Ledkov <xnox@ubuntu.com>
---

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 5b1597a636..1fecf78c3a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -582,7 +582,7 @@ TESTS_ENVIRONMENT +=						\
 	PKCS12PASSWORD_2=""					\
 	PKCS12PATH=$(srcdir)/cert-tests/data/			\
 	X509CERTDIR=$(srcdir)/x509cert-dir/			\
-	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/system.prio	\
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio	\
 	PSK_FILE=$(srcdir)/psk.passwd				\
 	OPENSSL_ia32cap=0x00000000				\
 	EXEEXT=$(EXEEXT)					\
diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am
index 38dd2fb53f..11a9c3b3dd 100644
--- a/tests/cert-tests/Makefile.am
+++ b/tests/cert-tests/Makefile.am
@@ -156,7 +156,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 \
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio \
 	srcdir="$(srcdir)"
 
 if ENABLE_FIPS140
diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am
index 9418985d97..b9de9dc472 100644
--- a/tests/slow/Makefile.am
+++ b/tests/slow/Makefile.am
@@ -67,7 +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	\
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio	\
 	top_builddir="$(top_builddir)"				\
 	srcdir="$(srcdir)"
 
diff --git a/tests/suite/Makefile.am b/tests/suite/Makefile.am
index def83efba7..025f513f78 100644
--- a/tests/suite/Makefile.am
+++ b/tests/suite/Makefile.am
@@ -53,7 +53,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \
 	srcdir="$(srcdir)"		\
 	ASAN_OPTIONS="detect_leaks=0"	\
 	GNUTLS_TEST_SUITE_RUN=1		\
-	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/../system.prio \
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio \
 	OPENSSL_ia32cap=0x00000000
 
 if ENABLE_NON_SUITEB_CURVES
diff --git a/tests/windows/Makefile.am b/tests/windows/Makefile.am
index 1d238d23f2..942b27b8ee 100644
--- a/tests/windows/Makefile.am
+++ b/tests/windows/Makefile.am
@@ -71,6 +71,6 @@ TESTS_ENVIRONMENT =						\
 	LC_ALL="C"				\
 	GNUTLS_TEST_SUITE_RUN=1			\
 	EXEEXT=$(EXEEXT)			\
-	GNUTLS_SYSTEM_PRIORITY_FILE=$(srcdir)/../system.prio \
+	GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio \
 	top_builddir="$(top_builddir)"		\
 	srcdir="$(srcdir)"