X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/fb11ef91dc867391dbd8ed38ac58f05e17028a0a..d887805f4e4f22806af2776c229a73c8cd7abee6:/check-guile.in

diff --git a/check-guile.in b/check-guile.in
dissimilarity index 60%
index 137cb9c3e..214deec16 100644
--- a/check-guile.in
+++ b/check-guile.in
@@ -1,48 +1,51 @@
-#! /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.
-#
-# Example invocations:
-# ./check-guile
-# ./check-guile numbers.test
-# ./check-guile -i /usr/local/bin/guile
-# ./check-guile -i /usr/local/bin/guile numbers.test
-#
-# Dependencies: dirname sed
-
-build_dir=`pwd`
-srcdir=@srcdir@
-if [ x"$srcdir" = x. ]; then
-    srcdir=$build_dir
-fi
-TEST_SUITE_DIR=$srcdir/test-suite
-
-if [ x"$1" = x-i ] ; then
-    guile=$2
-    shift
-    shift
-    glp=
-else
-    guile=$build_dir/libguile/guile
-    glp=$srcdir
-fi
-
-if [ -f "$guile" -a -x "$guile" ] ; then
-    echo Testing $guile ... "$@"
-    if [ x"$glp" = x ] ; then
-        glp=`$guile -c "(for-each write-line %load-path)"`
-        glp=`echo $glp | sed 's/ /:/g'`:$srcdir
-    fi
-    GUILE_LOAD_PATH=$glp
-    export GUILE_LOAD_PATH
-    echo with GUILE_LOAD_PATH: $GUILE_LOAD_PATH
-else
-    echo ERROR: Cannot execute $guile
-    exit 1
-fi
-
-cd $TEST_SUITE_DIR
-exec $guile -e main -s guile-test --test-suite $TEST_SUITE_DIR/tests --log-file $build_dir/check-guile.log "$@"
-
-# check-guile ends here
+#! /bin/sh
+# Usage: check-guile [-i GUILE-INTERPRETER] [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
+# ./check-guile numbers.test
+# ./check-guile -i /usr/local/bin/guile
+# ./check-guile -i /usr/local/bin/guile numbers.test
+
+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
+else
+    guile=${top_builddir}/meta/guile
+fi
+
+GUILE_LOAD_PATH=$TEST_SUITE_DIR
+export GUILE_LOAD_PATH
+
+if [ -f "$guile" -a -x "$guile" ] ; then
+    echo Testing $guile ... "$@"
+    echo with GUILE_LOAD_PATH=$GUILE_LOAD_PATH
+else
+    echo ERROR: Cannot execute $guile
+    exit 1
+fi
+
+# documentation searching ignores GUILE_LOAD_PATH.
+if [ ! -f guile-procedures.txt ] ; then
+   @LN_S@ libguile/guile-procedures.txt .
+fi
+
+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