Rename all .fth/.fr files in CPM/tests to .fs

This commit is contained in:
Philip Zembrod
2024-12-07 12:40:27 +01:00
parent 17e07ff5b5
commit c147b2cba5
27 changed files with 98 additions and 98 deletions

View File

@@ -66,7 +66,7 @@ logtest.log: \
inctest.log: \ inctest.log: \
$(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \
include.fb log2file.fb inctest.fth) \ include.fb log2file.fb inctest.fs) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"kernel fileint.fb" \ "kernel fileint.fb" \
@@ -75,7 +75,7 @@ inctest.log: \
"include include.fb" \ "include include.fb" \
"include log2file.fb" \ "include log2file.fb" \
"logopen" \ "logopen" \
"include inctest.fth" \ "include inctest.fs" \
"logclose" \ "logclose" \
"bye" \ "bye" \
"exit" "exit"
@@ -161,58 +161,58 @@ $(cpmfilesdir)/v4thblk.com: \
test-kernel.log: \ test-kernel.log: \
$(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \ $(patsubst %, $(cpmfilesdir)/%, kernel.com fileint.fb \
include.fb log2file.fb core.fr) \ include.fb log2file.fb core.fs) \
$(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth)) \ $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fs)) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"kernel fileint.fb" \ "kernel fileint.fb" \
"1 load onlyforth" \ "1 load onlyforth" \
"$50 constant /tib" \ "$50 constant /tib" \
"include include.fb" \ "include include.fb" \
"include test-krn.fth" \ "include test-krn.fs" \
"bye" \ "bye" \
"exit" "exit"
dos2unix -n $(runcpmdir)/logfile.txt $@ dos2unix -n $(runcpmdir)/logfile.txt $@
test-min.log: \ test-min.log: \
$(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fs \ $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fs \
logfile.fth \ logfile.fs \
ans-shim.fth prelim.fth tester.fth core.fr test-min.fth) \ ans-shim.fs prelim.fs tester.fs core.fs test-min.fs) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"v4th sfileint.fs" \ "v4th sfileint.fs" \
"include-isfile" \ "include-isfile" \
"onlyforth" \ "onlyforth" \
"include test-min.fth" \ "include test-min.fs" \
"bye" \ "bye" \
"exit" "exit"
dos2unix -n $(runcpmdir)/logfile.txt $@ dos2unix -n $(runcpmdir)/logfile.txt $@
test-std.log: \ test-std.log: \
$(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fs \ $(patsubst %, $(cpmfilesdir)/%, v4th.com sfileint.fs \
logfile.fth core.fr) \ logfile.fs core.fs) \
$(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth)) \ $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fs)) \
| emu | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"v4th sfileint.fs" \ "v4th sfileint.fs" \
"include-isfile" \ "include-isfile" \
"onlyforth" \ "onlyforth" \
"include test-std.fth" \ "include test-std.fs" \
"bye" \ "bye" \
"exit" "exit"
dos2unix -n $(runcpmdir)/logfile.txt $@ dos2unix -n $(runcpmdir)/logfile.txt $@
test-blk.log: \ test-blk.log: \
$(patsubst %, $(cpmfilesdir)/%, v4thblk.com sfileint.fs \ $(patsubst %, $(cpmfilesdir)/%, v4thblk.com sfileint.fs \
sblkint.fs log2file.fb core.fr) \ sblkint.fs log2file.fb core.fs) \
$(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fth) \ $(patsubst tests/%, $(cpmfilesdir)/%, $(wildcard tests/*.fs) \
tests/empty.fb) | emu tests/empty.fb) | emu
./emulator/run-in-runcpm.sh \ ./emulator/run-in-runcpm.sh \
"v4thblk sfileint.fs" \ "v4thblk sfileint.fs" \
"include-isfile" \ "include-isfile" \
"include sblkint.fs" \ "include sblkint.fs" \
"onlyforth" \ "onlyforth" \
"include test-blk.fth" \ "include test-blk.fs" \
"bye" \ "bye" \
"exit" "exit"
dos2unix -n $(runcpmdir)/logfile.txt $@ dos2unix -n $(runcpmdir)/logfile.txt $@

View File

@@ -1,5 +1,5 @@
BLOCK.FTH **=== NOT TESTED === ******* EMPTY.FB Scr 21 BLOCK.FS **=== NOT TESTED === ******* EMPTY.FB Scr 21
0 Should show a (mostly) blank screen 0 Should show a (mostly) blank screen
1 1
2 2

View File

@@ -1,6 +1,6 @@
TESTER.FTH ERROR exists TESTER.FS ERROR exists
CORE.FR CORE.FS
*********************YOU SHOULD SEE THE STANDARD GRAPHIC CHARACTERS: *********************YOU SHOULD SEE THE STANDARD GRAPHIC CHARACTERS:
!"#$%&'()*+,-./0123456789:;<=>?@ !"#$%&'()*+,-./0123456789:;<=>?@
ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_` ABCDEFGHIJKLMNOPQRSTUVWXYZ[\]^_`

View File

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

View File

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

View File

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

View File

@@ -1,5 +1,5 @@
ok ok
include inctest.fth include inctest.fs
INCTEST.FTH included from stream file: "1 2 + 4 * .": 12 INCTEST.FS included from stream file: "1 2 + 4 * .": 12
ok ok
logclose logclose

View File

@@ -1,6 +1,6 @@
ANS-SHIM.FTH ANS-SHIM.FS
PRELIM.FTH PRELIM.FS
CR CR SOURCE TYPE ( Preliminary test ) CR CR CR SOURCE TYPE ( Preliminary test ) CR
SOURCE ( These lines test SOURCE, TYPE, CR and parenthetic comments ) TYPE CR SOURCE ( These lines test SOURCE, TYPE, CR and parenthetic comments ) TYPE CR

View File

@@ -0,0 +1,26 @@
include log2file.fb \ so that include with block file gets tested
' noop Is .status
logopen
include ans-shim.fs
: \vf [compile] \ ; immediate
include prelim.fs
include tester.fs
\ 1 verbose !
include core.fs
include coreplus.fs
include util.fs
include errorrep.fs
include coreext.fs
include doubltst.fs
include block.fs
REPORT-ERRORS
logclose

View File

@@ -1,26 +0,0 @@
include log2file.fb \ so that include with block file gets tested
' noop Is .status
logopen
include ans-shim.fth
: \vf [compile] \ ; immediate
include prelim.fth
include tester.fth
\ 1 verbose !
include core.fr
include coreplus.fth
include util.fth
include errorrep.fth
include coreext.fth
include doubltst.fth
include block.fth
REPORT-ERRORS
logclose

View File

@@ -0,0 +1,22 @@
include log2file.fb
logopen
include ans-shim.fs
: \vf [compile] \ ; immediate
include prelim.fs
include tester.fs
\ 1 verbose !
include core.fs
include coreplus.fs
include util.fs
include errorrep.fs
include coreext.fs
REPORT-ERRORS
logclose

View File

@@ -1,22 +0,0 @@
include log2file.fb
logopen
include ans-shim.fth
: \vf [compile] \ ; immediate
include prelim.fth
include tester.fth
\ 1 verbose !
include core.fr
include coreplus.fth
include util.fth
include errorrep.fth
include coreext.fth
REPORT-ERRORS
logclose

View File

@@ -0,0 +1,14 @@
include logfile.fs
logopen
include ans-shim.fs
: \vf [compile] \ ; immediate
include prelim.fs
include tester.fs
\ 1 verbose !
include core.fs
logclose

View File

@@ -1,14 +0,0 @@
include logfile.fth
logopen
include ans-shim.fth
: \vf [compile] \ ; immediate
include prelim.fth
include tester.fth
\ 1 verbose !
include core.fr
logclose

View File

@@ -3,26 +3,26 @@
\ blk @ ?dup IF ." Blk " u. ?cr exit THEN \ blk @ ?dup IF ." Blk " u. ?cr exit THEN
\ incfile @ IF tib #tib @ cr type THEN ; \ incfile @ IF tib #tib @ cr type THEN ;
include logfile.fth include logfile.fs
logopen logopen
include ans-shim.fth include ans-shim.fs
: \vf [compile] \ ; immediate : \vf [compile] \ ; immediate
include prelim.fth include prelim.fs
include tester.fth include tester.fs
\ 1 verbose ! \ 1 verbose !
include core.fr include core.fs
include coreplus.fth include coreplus.fs
include util.fth include util.fs
include errorrep.fth include errorrep.fs
include coreext.fth include coreext.fs
\ ' .blk|tib Is .status \ ' .blk|tib Is .status
include doubltst.fth include doubltst.fs
REPORT-ERRORS REPORT-ERRORS