diff options
| author | Thien-Thi Nguyen <ttn@gnuvola.org> | 2002-02-05 09:21:54 +0000 |
|---|---|---|
| committer | Thien-Thi Nguyen <ttn@gnuvola.org> | 2002-02-05 09:21:54 +0000 |
| commit | ba833f4a2fdd81311b6a31398c59cf23b5f22e4d (patch) | |
| tree | 0a5520ca7bc3a98937afb396315cd947c4dd36b5 | |
| parent | 3ac1e90a7c392d6c7c29b33d5fd45a635a969e90 (diff) | |
| download | guile-ba833f4a2fdd81311b6a31398c59cf23b5f22e4d.tar.gz | |
(srcdir): Delete var.
(top_builddir, top_srcdir, guile_opts): New vars.
Use "set -e".
No longer set LTDL_LIBRARY_PATH.
Use ${top_srcdir}/pre-inst-guile instead of libguile/guile.
| -rw-r--r-- | check-guile.in | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/check-guile.in b/check-guile.in index ebfe89cb2..ed571becb 100644 --- a/check-guile.in +++ b/check-guile.in @@ -1,6 +1,6 @@ #! /bin/sh # Usage: check-guile [-i GUILE-INTERPRETER] [GUILE-TEST-ARGS] -# If `-i GUILE-INTERPRETER' is omitted, use libguile/guile. +# If `-i GUILE-INTERPRETER' is omitted, use ${top_srcdir}/pre-inst-guile. # See test-suite/guile-test for documentation on GUILE-TEST-ARGS. # # Example invocations: @@ -9,27 +9,31 @@ # ./check-guile -i /usr/local/bin/guile # ./check-guile -i /usr/local/bin/guile numbers.test +set -e + # this script runs in the top-level build-dir. -srcdir=@srcdir@ -TEST_SUITE_DIR=$srcdir/test-suite +top_builddir=@srcdir@ + +top_srcdir=@top_srcdir@ + +TEST_SUITE_DIR=$top_builddir/test-suite if [ x"$1" = x-i ] ; then guile=$2 + guile_opts= shift shift GUILE_LOAD_PATH=$TEST_SUITE_DIR else - guile=libguile/guile - GUILE_LOAD_PATH=$srcdir:$TEST_SUITE_DIR - LTDL_LIBRARY_PATH=`pwd`/srfi:${LTDL_LIBRARY_PATH} + guile=${top_srcdir}/pre-inst-guile + guile_opts="${top_builddir}" + GUILE_LOAD_PATH=${top_builddir}:$TEST_SUITE_DIR fi 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 @@ -40,6 +44,9 @@ if [ ! -f guile-procedures.txt ] ; then @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 $guile_opts \ + -e main -s "$TEST_SUITE_DIR/guile-test" \ + --test-suite "$TEST_SUITE_DIR/tests" \ + --log-file check-guile.log "$@" # check-guile ends here |