mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-29 19:30:36 +02:00
(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.
This commit is contained in:
parent
3ac1e90a7c
commit
ba833f4a2f
1 changed files with 16 additions and 9 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue