diff options
| author | Daiki Ueno <ueno@gnu.org> | 2021-11-11 06:22:34 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2021-11-11 06:22:34 +0000 |
| commit | ce730c61808c38f318297835d7a3f159a202b820 (patch) | |
| tree | 739f2dd871c62b5387211dabc96a22678bec9fec | |
| parent | 33988a11e36705e7f376b7fa6747ad06aa673890 (diff) | |
| parent | 606ed730ad6d6377ba1b8fad81a4c55f3eb40528 (diff) | |
| download | gnutls-ce730c61808c38f318297835d7a3f159a202b820.tar.gz | |
Merge branch 'abs-top-builddir-fix' into 'master'
tests: pass $abs_top_builddir more consistently
See merge request gnutls/gnutls!1484
| -rw-r--r-- | tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/cert-tests/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/slow/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/windows/Makefile.am | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am index e830291aa5..14427d67db 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -598,6 +598,7 @@ TESTS_ENVIRONMENT += \ GNUTLS_TEST_SUITE_RUN=1 \ builddir="$(builddir)" \ top_builddir="$(top_builddir)" \ + abs_top_builddir="$(abs_top_builddir)" \ libdir="$(libdir)" \ srcdir="$(srcdir)" diff --git a/tests/cert-tests/Makefile.am b/tests/cert-tests/Makefile.am index ef5f9029dd..fe196917bb 100644 --- a/tests/cert-tests/Makefile.am +++ b/tests/cert-tests/Makefile.am @@ -155,6 +155,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ VALGRIND="$(VALGRIND)" \ LIBTOOL="$(LIBTOOL)" \ top_builddir="$(top_builddir)" \ + abs_top_builddir="$(abs_top_builddir)" \ ac_cv_sizeof_time_t="$(ac_cv_sizeof_time_t)" \ ASAN_OPTIONS="detect_leaks=0:exitcode=6" \ GNUTLS_TEST_SUITE_RUN=1 \ diff --git a/tests/slow/Makefile.am b/tests/slow/Makefile.am index 774be5186e..746f8e65bd 100644 --- a/tests/slow/Makefile.am +++ b/tests/slow/Makefile.am @@ -61,6 +61,7 @@ TESTS_ENVIRONMENT = EXEEXT=$(EXEEXT) \ OPENSSL_ia32cap=0x00000000 \ GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio \ top_builddir="$(top_builddir)" \ + abs_top_builddir="$(abs_top_builddir)" \ srcdir="$(srcdir)" if WINDOWS diff --git a/tests/windows/Makefile.am b/tests/windows/Makefile.am index 9fbc03c527..34e5112e8f 100644 --- a/tests/windows/Makefile.am +++ b/tests/windows/Makefile.am @@ -73,4 +73,5 @@ TESTS_ENVIRONMENT = \ EXEEXT=$(EXEEXT) \ GNUTLS_SYSTEM_PRIORITY_FILE=$(abs_top_srcdir)/tests/system.prio \ top_builddir="$(top_builddir)" \ + abs_top_builddir="$(abs_top_builddir)" \ srcdir="$(srcdir)" |