ref: e3161204db4fbc9032cbdbeab83529db2a095ad4
parent: 2463faf90782989d048b2e3c63228a73eb1c2b28
author: Lennart Augustsson <lennart.augustsson@epicgames.com>
date: Thu Jul 18 06:13:26 EDT 2024
Include errtest in runtestsmhs
--- a/Makefile
+++ b/Makefile
@@ -151,7 +151,7 @@
everytestmhs: bin/mhs bin/mhseval exampletest cachetest bootstrap runtestmhs nfibtest info
runtestmhs:
- cd tests; make MHS=../bin/mhs cache; make MHS="../bin/mhs +RTS -H4M -RTS -CR" info test
+ cd tests; make MHS=../bin/mhs cache; make MHS="../bin/mhs +RTS -H4M -RTS -CR" info test errtest
bootcombtest: bin/gmhs bin/mhseval
bin/gmhs $(MHSINC) -ogmhs.comb MicroHs.Main
--- a/MicroHs.cabal
+++ b/MicroHs.cabal
@@ -29,6 +29,7 @@
src/runtime/*.h
tests/Makefile
tests/*.hs
+ tests/*.hs-boot
tests/*.ref
data-files:
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -67,7 +67,7 @@
$(TMHS) Eq1 && $(EVAL) > Eq1.out && diff Eq1.ref Eq1.out
errtest:
- sh errtester.sh < errmsg.test
+ sh errtester.sh $(MHS) < errmsg.test
interactivetest:
$(TMHS) < itest.in | sed -e '1,/^>/d' > itest.out && diff itest.ref itest.out
--- a/tests/errtester.sh
+++ b/tests/errtester.sh
@@ -5,7 +5,7 @@
err=$tmp/err
terr=$tmp/terr
cerr=$tmp/cerr
-comp=../bin/gmhs
+comp=$1; shift
read -r line
mkdir -p $tmp
@@ -37,6 +37,6 @@
#echo "==="
#echo "next: $line"
sed -e '/^ *$/d' $terr > $err
- $comp -i../lib -i../tmp E 2>&1 | sed -e 's/^gmhs/mhs/' -e '/CallStack/,$d' -e '/^XX/d' > $cerr
+ $comp $* -i../lib -i../tmp E 2>&1 | sed -e 's/^gmhs/mhs/' -e '/CallStack/,$d' -e '/^XX/d' -e 's/^mhs: error:/mhs:/' > $cerr
diff $err $cerr || exit 1
done
--
⑨