[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
guile/guile-core ChangeLog check-guile.in test-...
From: |
Gary Houston |
Subject: |
guile/guile-core ChangeLog check-guile.in test-... |
Date: |
Mon, 19 Mar 2001 14:46:21 -0800 |
CVSROOT: /cvs
Module name: guile
Changes by: Gary Houston <address@hidden> 01/03/19 14:46:21
Modified files:
guile-core : ChangeLog check-guile.in
guile-core/test-suite: ChangeLog guile-test
guile-core/test-suite/tests: r4rs.test
Log message:
* 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.
CVSWeb URLs:
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/ChangeLog.diff?r1=1.226&r2=1.227
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/check-guile.in.diff?r1=1.3&r2=1.4
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/test-suite/ChangeLog.diff?r1=1.73&r2=1.74
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/test-suite/guile-test.diff?r1=1.6&r2=1.7
http://subversions.gnu.org/cgi-bin/cvsweb/guile/guile-core/test-suite/tests/r4rs.test.diff?r1=1.5&r2=1.6
Patches:
Index: guile/guile-core/ChangeLog
diff -u guile/guile-core/ChangeLog:1.226 guile/guile-core/ChangeLog:1.227
--- guile/guile-core/ChangeLog:1.226 Mon Mar 19 04:39:36 2001
+++ guile/guile-core/ChangeLog Mon Mar 19 14:46:20 2001
@@ -3,6 +3,13 @@
* check-guile.in: rename $parent to $srcdir. if it's equal to "."
set it to `pwd`.
+ * 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.
+
2001-03-18 Gary Houston <address@hidden>
* check-guile.in: use @srcdir@ instead of @address@hidden use
Index: guile/guile-core/check-guile.in
diff -u guile/guile-core/check-guile.in:1.3 guile/guile-core/check-guile.in:1.4
--- guile/guile-core/check-guile.in:1.3 Mon Mar 19 04:38:40 2001
+++ guile/guile-core/check-guile.in Mon Mar 19 14:46:20 2001
@@ -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.
address@hidden@
-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
+
+# documentation searching ignores GUILE_LOAD_PATH.
+if [ ! -e guile-procedures.txt ]; then
+ ln -s libguile/guile-procedures.txt .
+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 "$@"
+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
Index: guile/guile-core/test-suite/ChangeLog
diff -u guile/guile-core/test-suite/ChangeLog:1.73
guile/guile-core/test-suite/ChangeLog:1.74
--- guile/guile-core/test-suite/ChangeLog:1.73 Sun Mar 18 15:17:32 2001
+++ guile/guile-core/test-suite/ChangeLog Mon Mar 19 14:46:21 2001
@@ -1,3 +1,13 @@
+2001-03-19 Gary Houston <address@hidden>
+
+ * 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.
+
2001-03-18 Gary Houston <address@hidden>
* guile-test: use #!/bogus-path/..., not #!/home/dirk/... in the
Index: guile/guile-core/test-suite/guile-test
diff -u guile/guile-core/test-suite/guile-test:1.6
guile/guile-core/test-suite/guile-test:1.7
--- guile/guile-core/test-suite/guile-test:1.6 Sun Mar 18 15:17:32 2001
+++ guile/guile-core/test-suite/guile-test Mon Mar 19 14:46:21 2001
@@ -76,7 +76,7 @@
;;; User configurable settings:
(define default-test-suite
- (string-append (getenv "HOME") "/guile-core/test-suite"))
+ (string-append (getenv "HOME") "/bogus-path/test-suite"))
(use-modules (test-suite lib)
@@ -87,6 +87,8 @@
;;; Variables that will receive their actual values later.
(define test-suite default-test-suite)
+(define tmp-dir #f)
+
;;; General utilities, that probably should be in a library somewhere.
@@ -126,11 +128,10 @@
;;; The test driver.
-;;; Localizing test files and temporary data files relative to the
-;;; test suite directory.
+;;; Localizing test files and temporary data files.
(define (data-file-name filename)
- (in-vicinity test-suite filename))
+ (in-vicinity tmp-dir filename))
(define (test-file-name test)
(in-vicinity test-suite test))
@@ -174,6 +175,11 @@
(or (opt 'test-suite #f)
(getenv "TEST_SUITE_DIR")
default-test-suite))
+
+ ;; directory where temporary files are created.
+ ;; when run from "make check", this must be under the build-dir,
+ ;; not the src-dir.
+ (set! tmp-dir (getcwd))
(let* ((tests
(let ((foo (opt '() '())))
Index: guile/guile-core/test-suite/tests/r4rs.test
diff -u guile/guile-core/test-suite/tests/r4rs.test:1.5
guile/guile-core/test-suite/tests/r4rs.test:1.6
--- guile/guile-core/test-suite/tests/r4rs.test:1.5 Thu Mar 1 17:38:01 2001
+++ guile/guile-core/test-suite/tests/r4rs.test Mon Mar 19 14:46:21 2001
@@ -935,8 +935,8 @@
(SECTION 6 10 1)
(test #t input-port? (current-input-port))
(test #t output-port? (current-output-port))
-(test #t call-with-input-file (data-file-name "r4rs.test") input-port?)
-(define this-file (open-input-file (data-file-name "r4rs.test")))
+(test #t call-with-input-file (test-file-name "r4rs.test") input-port?)
+(define this-file (open-input-file (test-file-name "r4rs.test")))
(test #t input-port? this-file)
(SECTION 6 10 2)
(test #\; peek-char this-file)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- guile/guile-core ChangeLog check-guile.in test-...,
Gary Houston <=