tests: run "generic" tests under all Collapse OS architectures

There's no reason to run them only under CVM.
This commit is contained in:
Virgil Dupras 2020-10-24 14:57:33 -04:00
parent ae62e291e6
commit c072096909
5 changed files with 11 additions and 9 deletions

View File

@ -1,9 +1,6 @@
CDIR = ../cvm
EDIR = ../emul
.PHONY: run
run:
$(MAKE) -C $(CDIR) all
$(MAKE) -C $(EDIR) all
cd cvm && ./runtests.sh
$(MAKE) -C ../cvm all
$(MAKE) -C ../emul all
cd all && ./runtests.sh
cd z80 && ./runtests.sh

View File

@ -1,13 +1,18 @@
#!/bin/sh -e
BASE=../..
EXEC="${BASE}/cvm/forth"
CVM="${BASE}/cvm/forth"
Z80="${BASE}/emul/forth"
TMP=$(mktemp)
chk() {
echo "Running test $1"
cat ../harness.fs $1 > ${TMP}
if ! ${EXEC} ${TMP}; then
echo "Running test $1 under CVM"
if ! ${CVM} ${TMP}; then
exit 1
fi
echo "Running test $1 under Z80"
if ! ${Z80} ${TMP}; then
exit 1
fi
}