diff options
author | Ludovic Courtès <ludo@gnu.org> | 2009-12-14 10:59:25 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2009-12-14 10:59:25 +0100 |
commit | 5b98517a652ea51cbb0fd03e87a50c0b3add9707 (patch) | |
tree | 5480a80180e845baf295871cdb5e2d4eb2dda5cb | |
parent | 61521ea0341286251d615b89e7ee9cd73a42201c (diff) | |
download | guile-5b98517a652ea51cbb0fd03e87a50c0b3add9707.tar.gz |
Fix test environment issue with ltdl from Libtool 2.2.6b.
Earlier versions of ltdl would look for extensions under $PWD; this
behavior changed in 2.2.6b.
* test-suite/standalone/Makefile.am (TESTS_ENVIRONMENT): Define
$builddir.
* test-suite/standalone/test-asmobs: Specify the full path to
`libtest-asmobs', using $builddir.
* test-suite/standalone/test-extensions: Likewise.
-rw-r--r-- | test-suite/standalone/Makefile.am | 1 | ||||
-rwxr-xr-x | test-suite/standalone/test-asmobs | 3 | ||||
-rwxr-xr-x | test-suite/standalone/test-extensions | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/test-suite/standalone/Makefile.am b/test-suite/standalone/Makefile.am index 17ac1e7ac..27fe3c126 100644 --- a/test-suite/standalone/Makefile.am +++ b/test-suite/standalone/Makefile.am @@ -29,6 +29,7 @@ BUILT_SOURCES = EXTRA_DIST = TESTS_ENVIRONMENT = \ + builddir="$(builddir)" \ GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env" ## Check for headers in $(srcdir) and bulid dir before $(CPPFLAGS), which diff --git a/test-suite/standalone/test-asmobs b/test-suite/standalone/test-asmobs index 2ea75d9bf..9689ab9c6 100755 --- a/test-suite/standalone/test-asmobs +++ b/test-suite/standalone/test-asmobs @@ -2,7 +2,8 @@ exec guile -q -s "$0" "$@" !# -(load-extension "libtest-asmobs" "libtest_asmobs_init") +(load-extension (string-append (getenv "builddir") "/libtest-asmobs") + "libtest_asmobs_init") (define (test x v) (if v diff --git a/test-suite/standalone/test-extensions b/test-suite/standalone/test-extensions index bea432de2..ec320113b 100755 --- a/test-suite/standalone/test-extensions +++ b/test-suite/standalone/test-extensions @@ -2,8 +2,10 @@ exec guile -q -s "$0" "$@" !# -(load-extension "libtest-extensions" "libtest_extensions_init") -(load-extension "libtest-extensions" "libtest_extensions_init2") +(load-extension (string-append (getenv "builddir") "/libtest-extensions") + "libtest_extensions_init") +(load-extension (string-append (getenv "builddir") "/libtest-extensions") + "libtest_extensions_init2") (or (= init2-count 1) (error "init2 called more or less than one time")) |