defsubst

[bpt/guile.git] / check-guile.in

diff --git a/check-guile.in b/check-guile.in
index 8c350f2..214deec 100644 (file)
--- 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 ${top_srcdir}/pre-inst-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
@@ -11,24 +11,21 @@
 
 set -e
 
-# this script runs in the top-level build-dir.
-top_builddir=`pwd`
+top_builddir=@top_builddir_absolute@
+top_srcdir=@top_srcdir_absolute@
 
-top_srcdir=@top_srcdir@
-
-TEST_SUITE_DIR=$top_builddir/test-suite
+TEST_SUITE_DIR=${top_srcdir}/test-suite
+export TEST_SUITE_DIR
 
 if [ x"$1" = x-i ] ; then
     guile=$2
-    guile_opts=
     shift
     shift
-    GUILE_LOAD_PATH=$TEST_SUITE_DIR
 else
-    guile=${top_srcdir}/pre-inst-guile
-    guile_opts="${top_builddir}"
-    GUILE_LOAD_PATH=${top_builddir}:$TEST_SUITE_DIR
+    guile=${top_builddir}/meta/guile
 fi
+
+GUILE_LOAD_PATH=$TEST_SUITE_DIR
 export GUILE_LOAD_PATH
 
 if [ -f "$guile" -a -x "$guile" ] ; then
@@ -44,8 +41,10 @@ if [ ! -f guile-procedures.txt ] ; then
    @LN_S@ libguile/guile-procedures.txt .
 fi
 
-exec $guile $guile_opts \
-    -e main -s "$TEST_SUITE_DIR/guile-test" \
+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 "$@"