diff --git a/Makefile b/Makefile index 0307db11e..f29ea27e6 100644 --- a/Makefile +++ b/Makefile @@ -22,8 +22,8 @@ uninstall: $(RM) `opam var bin`/$(EXECUTABLE) regression: - $(MAKE) clean check -C regression - $(MAKE) clean check -C stdlib/regression + $(MAKE) clean check -j -C regression + $(MAKE) clean check -j -C stdlib/regression bash deploy_build.sh $(MAKE) -C lama-compiler diff --git a/lama-compiler/Makefile b/lama-compiler/Makefile index 04bfba1aa..4bd2a7253 100644 --- a/lama-compiler/Makefile +++ b/lama-compiler/Makefile @@ -1,9 +1,11 @@ -.PHONY: all +.PHONY: all all: - make -C src - make -C runtime - make -C regression + @echo "build Lama in Lama" + @make -C src + @make -C runtime + @echo "regression Lama in Lama" + @make -C regression clean: make clean -C src diff --git a/lama-compiler/regression/Makefile b/lama-compiler/regression/Makefile index 9ea11d187..1e84a8c3d 100644 --- a/lama-compiler/regression/Makefile +++ b/lama-compiler/regression/Makefile @@ -9,10 +9,10 @@ RM=rm -rf check: $(TESTS) expr_tests $(TESTS): %: %.lama - @echo $@ - @ulimit -s -S 32768; cat $@.input | $(LAMAC) $@.lama -i > $@.log && diff $@.log orig/$@.log + @echo "lama-compiler/regression/$@" + @ulimit -s -S 32768; cat $@.input | $(LAMAC) $@.lama -i > $@.log && diff $@.log orig/$@.log @ulimit -s -S 32768; cat $@.input | $(LAMAC) $@.lama -s > $@.log && diff $@.log orig/$@.log - $(LAMAC) $@.lama && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log + @$(LAMAC) $@.lama && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log expr_tests: make -C expressions diff --git a/lama-compiler/regression/deep-expressions/Makefile b/lama-compiler/regression/deep-expressions/Makefile index f5c99892d..fc9547d7f 100644 --- a/lama-compiler/regression/deep-expressions/Makefile +++ b/lama-compiler/regression/deep-expressions/Makefile @@ -7,7 +7,7 @@ LAMAC = ../../src/lama-impl check: $(TESTS) $(TESTS): %: %.lama - @echo $@ + @echo "lama-compiler/regression/deep-expressions/$@" @cat $@.input | $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log @cat $@.input | $(LAMAC) -s $< > $@.log && diff $@.log orig/$@.log @LAMA_RUNTIME=../../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log diff --git a/lama-compiler/regression/expressions/Makefile b/lama-compiler/regression/expressions/Makefile index f5c99892d..2ac7a61e5 100644 --- a/lama-compiler/regression/expressions/Makefile +++ b/lama-compiler/regression/expressions/Makefile @@ -7,7 +7,7 @@ LAMAC = ../../src/lama-impl check: $(TESTS) $(TESTS): %: %.lama - @echo $@ + @echo "lama-compiler/regression/expressions/$@" @cat $@.input | $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log @cat $@.input | $(LAMAC) -s $< > $@.log && diff $@.log orig/$@.log @LAMA_RUNTIME=../../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log diff --git a/regression/Makefile b/regression/Makefile index cdc36d7c9..6512b86b0 100644 --- a/regression/Makefile +++ b/regression/Makefile @@ -1,18 +1,28 @@ -TESTS=$(sort $(basename $(wildcard test*.lama))) +DEBUG_FILES=stack-dump-before data-dump-before extra-roots-dump-before heap-dump-before stack-dump-after data-dump-after extra-roots-dump-after heap-dump-after +TESTS=$(sort $(filter-out test111, $(basename $(wildcard test*.lama)))) LAMAC=../src/lamac .PHONY: check $(TESTS) -check: $(TESTS) + +check: ctest111 $(TESTS) expr_tests $(TESTS): %: %.lama - @echo $@ -# cat $@.input | LAMA=../runtime $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log -# cat $@.input | LAMA=../runtime $(LAMAC) -ds -s $< > $@.log && diff $@.log orig/$@.log - LAMA=../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log + @echo "regression/$@" + @cat $@.input | LAMA=../runtime $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log + @cat $@.input | LAMA=../runtime $(LAMAC) -ds -s $< > $@.log && diff $@.log orig/$@.log + @LAMA=../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log + +ctest111: + @echo "regression/test111" + @LAMA=../runtime $(LAMAC) test111.lama && cat test111.input | ./test111 > test111.log && diff test111.log orig/test111.log + +expr_tests: + make -j -C expressions + make -j -C deep-expressions clean: - $(RM) test*.log *.s *~ $(TESTS) *.i + $(RM) test*.log *.s *.sm *~ $(TESTS) *.i $(DEBUG_FILES) $(MAKE) clean -C expressions $(MAKE) clean -C deep-expressions diff --git a/regression/deep-expressions/Makefile b/regression/deep-expressions/Makefile index b37c09433..981d04b6b 100644 --- a/regression/deep-expressions/Makefile +++ b/regression/deep-expressions/Makefile @@ -7,10 +7,10 @@ LAMAC = ../../src/lamac check: $(TESTS) $(TESTS): %: %.lama - @echo $@ + @echo "regression/deep-expressions/$@" @LAMA=../../runtime $(LAMAC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log - @cat $@.input | $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log - @cat $@.input | $(LAMAC) -s $< > $@.log && diff $@.log orig/$@.log + @cat $@.input | LAMA=../../runtime $(LAMAC) -i $< > $@.log && diff $@.log orig/$@.log + @cat $@.input | LAMA=../../runtime $(LAMAC) -s $< > $@.log && diff $@.log orig/$@.log clean: rm -f *.log *.s *~ diff --git a/regression/expressions/Makefile b/regression/expressions/Makefile index 8ab41d698..4e4737c6e 100644 --- a/regression/expressions/Makefile +++ b/regression/expressions/Makefile @@ -7,10 +7,10 @@ RC = ../../src/lamac check: $(TESTS) $(TESTS): %: %.lama - @echo $@ + @echo "regression/expressions/$@" @LAMA=../../runtime $(RC) $< && cat $@.input | ./$@ > $@.log && diff $@.log orig/$@.log - @cat $@.input | $(RC) -i $< > $@.log && diff $@.log orig/$@.log - @cat $@.input | $(RC) -s $< > $@.log && diff $@.log orig/$@.log + @cat $@.input | LAMA=../../runtime $(RC) -i $< > $@.log && diff $@.log orig/$@.log + @cat $@.input | LAMA=../../runtime $(RC) -s $< > $@.log && diff $@.log orig/$@.log clean: rm -f *.log *.s *~