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 5b1597a6366f470dec2a8a6b3b37263dc2bd18db..1fecf78c3ae81ee6b7026a8b0bb1ef3b36d429ae 100644 (file)
--- 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 38dd2fb53f5916165dbd0041c3ee6ac8e9a68f4f..11a9c3b3dd6f94f8f0bf4db4f204e046d311e31c 100644 (file)
--- 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 9418985d97796d30507e32ea39ee6a6f80f41b86..b9de9dc472d89fb38df3f967bcfbe8a65e7624ef 100644 (file)
--- 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 def83efba76d0acb321bf8bbf6994f999782fc8b..025f513f78f529fb25f4a7d51e17cf3b7c0557f3 100644 (file)
--- 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 1d238d23f2eb7b329e097f082353663c9e31ba10..942b27b8ee2e390bd3c2c3ea3bf79fe04221e120 100644 (file)
--- 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)"