diff options
| author | Gary Houston <ghouston@arglist.com> | 2001-03-19 22:46:21 +0000 |
|---|---|---|
| committer | Gary Houston <ghouston@arglist.com> | 2001-03-19 22:46:21 +0000 |
| commit | 66301f9ab8e0392e0ffcc014edaf0b7fb7a71449 (patch) | |
| tree | e67c37fce951e905259519f8e5db21808aa8b708 /check-guile.in | |
| parent | a4928305140f7f9d9f7a833d8163cf60f95572c5 (diff) | |
| download | guile-66301f9ab8e0392e0ffcc014edaf0b7fb7a71449.tar.gz | |
* check-guile.in: 16 documentation tests were failing if "make
check" was run before Guile had been installed with the current
--prefix. made various changes to the script so that it runs
without a cd to the test-suite directory. For the -i option,
don't point GUILE_LOAD_PATH to the current directory, but let it
use it's own scheme library.
* tests/r4rs.test: use test-file-name to locate r4rs.test,
not data-file-name.
* guile-test: define tmp-dir, the location where r4rs.test will
create it's temporary files.
(data-file-name): use tmp-dir. this must be under build-dir,
not src-dir.
Diffstat (limited to 'check-guile.in')
| -rw-r--r-- | check-guile.in | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/check-guile.in b/check-guile.in index 137cb9c3e..645755665 100644 --- a/check-guile.in +++ b/check-guile.in @@ -8,41 +8,35 @@ # ./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` +# this script runs in the top-level build-dir. 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= + GUILE_LOAD_PATH=$TEST_SUITE_DIR else - guile=$build_dir/libguile/guile - glp=$srcdir + guile=libguile/guile + GUILE_LOAD_PATH=$srcdir:$TEST_SUITE_DIR fi +export GUILE_LOAD_PATH 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 + 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 "$@" +# documentation searching ignores GUILE_LOAD_PATH. +if [ ! -e 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 "$@" # check-guile ends here |