Chez Scheme: fix tests to work outside of source directory

This commit is contained in:
Matthew Flatt 2020-08-02 18:30:13 -06:00
parent 0866ddea01
commit 2cca030eff
3 changed files with 10 additions and 4 deletions

View File

@ -2996,7 +2996,7 @@
(and (eqv? (get-mode "../mats") (get-mode "../mats/")) (and (eqv? (get-mode "../mats") (get-mode "../mats/"))
(eqv? (get-mode "../mats") (get-mode "../mats/."))) (eqv? (get-mode "../mats") (get-mode "../mats/.")))
; access times are unreliable on contemporary file systems ; access times are unreliable on contemporary file systems
(time? (file-access-time "../../mats/mat.ss")) (time? (file-access-time "mat.ss"))
(time<=? (file-change-time "mat.ss") (file-change-time "mat.so")) (time<=? (file-change-time "mat.ss") (file-change-time "mat.so"))
(time<=? (file-modification-time "mat.ss") (file-modification-time "mat.so")) (time<=? (file-modification-time "mat.ss") (file-modification-time "mat.so"))
(equal? (equal?

View File

@ -34,6 +34,8 @@
# For example, "make o=2 cp0=t ctb=8192" causes the mats to be run at # For example, "make o=2 cp0=t ctb=8192" causes the mats to be run at
# optimize level 2 with cp0 enabled and collect-trip-bytes set to 8192. # optimize level 2 with cp0 enabled and collect-trip-bytes set to 8192.
include Mf-config
ifeq (${OS},Windows_NT) ifeq (${OS},Windows_NT)
dirsep = ; dirsep = ;
else else
@ -391,12 +393,12 @@ source:
source$o: ${src} mat.ss oop.ss ht.ss cat_flush.c ${fsrc} freq.in freq.out m4test.in m4test.out script.all$o prettytest.ss ftype.h source$o: ${src} mat.ss oop.ss ht.ss cat_flush.c ${fsrc} freq.in freq.out m4test.in m4test.out script.all$o prettytest.ss ftype.h
rootsrc = $(shell cd ../../mats; echo *) rootsrc = $(shell cd ${upupsrcdir}/mats; echo *)
${rootsrc}: ${rootsrc}:
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
cp -p ../../mats/$@ $@ cp -p ${upupsrcdir}/mats/$@ $@
else else
ln -s ../../mats/$@ $@ ln -s ${upupsrcdir}/mats/$@ $@
endif endif
prettytest.ss: prettytest.ss:

View File

@ -380,4 +380,8 @@ cat > $W/Mf-config << END
srcdir=$srcdir srcdir=$srcdir
END END
cat > $W/mats/Mf-config << END
upupsrcdir=$upupsrcdir
END
exit 0 exit 0