update makes

.github/workflows/blank.yml

@@ -36,5 +36,5 @@ jobs:
       - run: opam depext Lama.dev --yes --with-test
       - run: opam install . --deps-only --with-test
       - run: eval $(opam env)
-      - run: opam exec -- make #dune build
-      - run: opam exec -- make regression # dune runtest
+      - run: opam exec -- make
+      - run: opam exec -- make regression-all

Makefile

@@ -21,10 +21,21 @@ uninstall:
 	$(RM) -r `opam var share`/Lama
 	$(RM) `opam var bin`/$(EXECUTABLE)
 
+regression-all: regression regression-expressions regression-lama-in-lama
+
 regression:
 	$(MAKE) clean check -j8 -C regression
 	$(MAKE) clean check -j8 -C stdlib/regression
-	bash deploy_build.sh
+
+regression-expressions:
+	$(MAKE) clean check -j8 -C regression/expressions
+	$(MAKE) clean check -j8 -C regression/deep-expressions
+
+regression-lama-in-lama: all
+	mkdir tmp-lama
+	cp runtime/Std.i tmp-lama
+	cp runtime/runtime.a tmp-lama
+	cp -R stdlib/* tmp-lama
 	$(MAKE) -C lama-compiler
 
 clean:

regression/Makefile

@@ -6,7 +6,7 @@ LAMAC=../src/lamac
 .PHONY: check $(TESTS)
 
 
-check: ctest111 $(TESTS) expr_tests
+check: ctest111 $(TESTS)
 
 $(TESTS): %: %.lama
 	@echo "regression/$@"
@@ -18,10 +18,6 @@ ctest111:
 	@echo "regression/test111"
 	@LAMA=../runtime $(LAMAC) test111.lama && cat test111.input | ./test111 > test111.log && diff test111.log orig/test111.log
 
-expr_tests:
-	make -j8 -C expressions
-	make -j8 -C deep-expressions
-
 clean:
 	$(RM) test*.log *.s *.sm *~ $(TESTS) *.i $(DEBUG_FILES) test111
 	$(MAKE) clean -C expressions

stdlib/regression/Makefile

@@ -7,8 +7,8 @@ LAMAC=../../src/lamac
 check: $(TESTS)
 
 $(TESTS): %: %.lama
-	@echo $@
-	LAMA=../../runtime $(LAMAC) -I .. -ds -dp $< && ./$@ > $@.log && diff $@.log orig/$@.log
+	@echo "stdlib/regression/$@"
+	@LAMA=../../runtime $(LAMAC) -I .. -ds -dp $< && ./$@ > $@.log && diff $@.log orig/$@.log
 
 clean:
 	$(RM) test*.log *.s *~ $(TESTS) *.i