mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
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.
This commit is contained in:
parent
61521ea034
commit
5b98517a65
3 changed files with 7 additions and 3 deletions
|
@ -29,6 +29,7 @@ BUILT_SOURCES =
|
||||||
EXTRA_DIST =
|
EXTRA_DIST =
|
||||||
|
|
||||||
TESTS_ENVIRONMENT = \
|
TESTS_ENVIRONMENT = \
|
||||||
|
builddir="$(builddir)" \
|
||||||
GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env"
|
GUILE_AUTO_COMPILE=0 "${top_builddir}/meta/uninstalled-env"
|
||||||
|
|
||||||
## Check for headers in $(srcdir) and bulid dir before $(CPPFLAGS), which
|
## Check for headers in $(srcdir) and bulid dir before $(CPPFLAGS), which
|
||||||
|
|
|
@ -2,7 +2,8 @@
|
||||||
exec guile -q -s "$0" "$@"
|
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)
|
(define (test x v)
|
||||||
(if v
|
(if v
|
||||||
|
|
|
@ -2,8 +2,10 @@
|
||||||
exec guile -q -s "$0" "$@"
|
exec guile -q -s "$0" "$@"
|
||||||
!#
|
!#
|
||||||
|
|
||||||
(load-extension "libtest-extensions" "libtest_extensions_init")
|
(load-extension (string-append (getenv "builddir") "/libtest-extensions")
|
||||||
(load-extension "libtest-extensions" "libtest_extensions_init2")
|
"libtest_extensions_init")
|
||||||
|
(load-extension (string-append (getenv "builddir") "/libtest-extensions")
|
||||||
|
"libtest_extensions_init2")
|
||||||
|
|
||||||
(or (= init2-count 1)
|
(or (= init2-count 1)
|
||||||
(error "init2 called more or less than one time"))
|
(error "init2 called more or less than one time"))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue