Add make rules for "std" test for v4th.com, i.e. all tests except the

block tests. Now that v4th.com has a 132 char TIB, it can process the
other tests, some of which have a few lines longer than 80 chars.
This commit is contained in:
Philip Zembrod 2022-03-17 22:18:14 +01:00
parent 54c3d25af5
commit 41cecebbfa
6 changed files with 27 additions and 12 deletions

View File

@ -6,7 +6,7 @@ fbfiles_uppercase = $(wildcard src/*.FB tests/*.FB)
fthfiles_caseconverted = $(patsubst %.fb, %.fth, \
$(shell ../../tools/echo-tolower.py $(fbfiles_uppercase)))
test: incltest.result logtest.result test-min.result \
test: incltest.result logtest.result test-min.result test-std.result \
incltest-volks4th.result test-volks4th-min.result
fth: $(fthfiles) $(fthfiles_caseconverted)
@ -76,6 +76,14 @@ test-min.log: \
"include logprep.fth include test-min.fth")
dos2unix -n dosfiles/OUTPUT.LOG $@
test-std.log: \
$(patsubst %, dosfiles/%, v4th.com $(prepsrcs)) \
$(patsubst tests/%, dosfiles/%, $(wildcard tests/*.*))
rm -f dosfiles/OUTPUT.LOG
(cd dosfiles && ../emulator/run-in-dosbox.sh v4th.com \
"include logprep.fth include test-std.fth")
dos2unix -n dosfiles/OUTPUT.LOG $@
incltest-volks4th.log: v4thfile.com tests/log2file.fb tests/incltest.fth
rm -f OUTPUT.LOG
@ -95,15 +103,15 @@ run-editor: volks4th.com emulator/run-in-dosbox.sh
test-min.golden: $(patsubst %, tests/golden/%.golden, prelim core)
cat $? > $@
cat $^ > $@
test-std.golden: $(patsubst %, tests/golden/%.golden, \
prelim core coreext double report-noblk)
cat $? > $@
prelim core coreplus coreext doubltst report-noblk)
cat $^ > $@
test-volks4th-min.golden: $(patsubst %, tests/golden/%.golden, \
volks4th-prelim core)
cat $? > $@
cat $^ > $@
%.golden: tests/golden/%.golden

View File

@ -1,9 +1,9 @@
utilities.fth ?DEFTEST1 exists
UTIL.FTH ?DEFTEST1 exists
Test utilities loaded
errorreport.fth
coreexttest.fth**************
ERRORREP.FTH
COREEXT.FTH **************
Output from .(
You should see -9876: -9876

View File

@ -1,5 +1,5 @@
COREPLUS.FTH********
COREPLUS.FTH ********
You should see 2345: 2345
*****
End of additional Core tests

View File

@ -1,3 +1,3 @@
doubletest.fth*****************
DOUBLTST.FTH *****************
End of Double-Number word tests

View File

@ -1,11 +1,15 @@
\ : .blk|tib
\ blk @ ?dup IF ." Blk " u. ?cr exit THEN
\ incfile @ IF tib #tib @ cr type THEN ;
include log2file.fth
logopen output.log
include ans-shim.fth
: \vf [compile] \ ; immediate
include prelimtest.fth
include prelim.fth
include tester.fth
\ 1 verbose !
include core.fr
@ -15,7 +19,10 @@ include util.fth
include errorrep.fth
include coreext.fth
include double.fth
\ ' .blk|tib Is .status
include doubltst.fth
REPORT-ERRORS