Test fixes.

augustss · Nov 27, 2023 · 56fef7b · 56fef7b
1 parent 4f01480
commit 56fef7b
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml
@@ -85,6 +85,9 @@ jobs:
     - name: make bootstrap
       run: make CONF=unix-32 bootstrap
       shell: alpine.sh {0}
+    - name: make nfib
+      run: make CONF=unix-32 nfibtest
+      shell: alpine.sh {0}
 # segfaults :(
 #    - name: make everytestmhs
 #      run: make CONF=unix-32 everytestmhs
@@ -112,3 +115,6 @@ jobs:
     - name: make bootstrap
       run: make CONF=unix-32 bootstrap
       shell: alpine.sh {0}
+    - name: make nfib
+      run: make CONF=unix-32 nfibtest
+      shell: alpine.sh {0}
diff --git a/Makefile b/Makefile
@@ -20,7 +20,7 @@ GHCOUT= -outputdir $(GHCOUTDIR)
 GHCPROF= # -prof -fprof-late #-prof -fprof-auto
 GHCFLAGS= $(GHCEXTS) $(GHCINCS) $(GHCWARNS) $(GHCOPTS) $(GHCTOOL) $(GHCPKGS) $(GHCOUT) $(GHCPROF)
 #
-.PHONY:	clean bootstrap install ghcgen newmhs cachelib timecompile exampletest cachetest runtest runtestmhs everytest everytestmhs
+.PHONY:	clean bootstrap install ghcgen newmhs cachelib timecompile exampletest cachetest runtest runtestmhs everytest everytestmhs nfibtest
 
 all:	bin/mhs
 
@@ -109,10 +109,10 @@ install:
 
 everytest:	runtest exampletest cachetest bootcombtest
 
-everytestmhs:	bin/mhs bin/mhseval exampletest cachetest bootstrap runtestmhs
+everytestmhs:	bin/mhs bin/mhseval exampletest cachetest bootstrap runtestmhs nfibtest
 
 runtestmhs:
-	cd tests; make MHS=../bin/mhs cache; make MHS="../bin/mhs -c" test nfib
+	cd tests; make MHS=../bin/mhs cache; make MHS="../bin/mhs -c" test
 
 bootcombtest:	bin/gmhs bin/mhseval
 	bin/gmhs -ilib -isrc -ogmhs.comb  MicroHs.Main
@@ -129,3 +129,6 @@ cachetest:	bin/mhs bin/mhseval Example.hs
 	bin/mhs -c AllOfLib
 	bin/mhs -c Example && bin/mhseval
 	rm -f .mhscache
+
+nfibtest: bin/mhs bin/mhseval
+	bin/mhs -itests Nfib && bin/mhseval
diff --git a/Makefile.windows b/Makefile.windows
@@ -17,4 +17,4 @@ exampletest:	bin/mhs.exe bin/mhseval.exe Example.hs
 	bin\mhs -r Example
 	bin\mhs Example && bin\mhseval
 #	bin\mhs Example -oEx.exe && Ex && rm Ex.exe
-        bin\mhs -i tests Nfib && bin\mhseval
+        bin\mhs -itests Nfib && bin\mhseval
diff --git a/tests/Makefile b/tests/Makefile
@@ -3,7 +3,7 @@ TMHS=$(MHS) -i../lib
 EVAL=../bin/mhseval
 .PHONY: test nfib clean errtest alltest cache
 
-alltest:	test errtest nfib
+alltest:	test errtest
 
 cache:
 	rm -f .mhscache