X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/0e70d77b81b59bf225ff33f6949e7bd7654fa00d..2fd79c4daa9fcfa7c4c63c88a8e87a27c425dd6c:/check-guile.in

diff --git a/check-guile.in b/check-guile.in
index e876af5e7..214deec16 100644
--- a/check-guile.in
+++ b/check-guile.in
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Usage: check-guile [-i GUILE-INTERPRETER] [GUILE-TEST-ARGS]
-# If `-i GUILE-INTERPRETER' is omitted, use libguile/guile.
-# See test-suite/guile-test for documentation on GUILE-TEST-ARGS.
+# If `-i GUILE-INTERPRETER' is omitted, use ${top_builddir}/meta/guile.
+# See ${top_srcdir}/test-suite/guile-test for documentation on GUILE-TEST-ARGS.
 #
 # Example invocations:
 # ./check-guile
@@ -9,27 +9,28 @@
 # ./check-guile -i /usr/local/bin/guile
 # ./check-guile -i /usr/local/bin/guile numbers.test
 
-# this script runs in the top-level build-dir.
-srcdir=@srcdir@
-TEST_SUITE_DIR=$srcdir/test-suite
+set -e
+
+top_builddir=@top_builddir_absolute@
+top_srcdir=@top_srcdir_absolute@
+
+TEST_SUITE_DIR=${top_srcdir}/test-suite
+export TEST_SUITE_DIR
 
 if [ x"$1" = x-i ] ; then
     guile=$2
     shift
     shift
-    GUILE_LOAD_PATH=$TEST_SUITE_DIR
 else
-    guile=libguile/guile
-    GUILE_LOAD_PATH=$srcdir:$TEST_SUITE_DIR
-    LTDL_LIBRARY_PATH=$srcdir/srfi/.libs:${LTDL_LIBRARY_PATH}
+    guile=${top_builddir}/meta/guile
 fi
+
+GUILE_LOAD_PATH=$TEST_SUITE_DIR
 export GUILE_LOAD_PATH
-export LTDL_LIBRARY_PATH
 
 if [ -f "$guile" -a -x "$guile" ] ; then
     echo Testing $guile ... "$@"
     echo with GUILE_LOAD_PATH=$GUILE_LOAD_PATH
-    echo with LTDL_LIBRARY_PATH=$LTDL_LIBRARY_PATH
 else
     echo ERROR: Cannot execute $guile
     exit 1
@@ -37,9 +38,14 @@ fi
 
 # documentation searching ignores GUILE_LOAD_PATH.
 if [ ! -f guile-procedures.txt ] ; then
-   ln -s libguile/guile-procedures.txt .
+   @LN_S@ libguile/guile-procedures.txt .
 fi
 
-exec "$guile" -e main -s "$TEST_SUITE_DIR/guile-test" --test-suite "$TEST_SUITE_DIR/tests" --log-file check-guile.log "$@"
+exec $guile \
+    --debug \
+    -L "$TEST_SUITE_DIR" \
+    --no-auto-compile -e main -s "$TEST_SUITE_DIR/guile-test" \
+    --test-suite "$TEST_SUITE_DIR/tests" \
+    --log-file check-guile.log "$@"
 
 # check-guile ends here