fix regression

This commit is contained in:
Danya Berezun 2023-09-04 21:45:50 +02:00
parent 17a7aa0116
commit 5119f69863
8 changed files with 36 additions and 24 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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 *~

View file

@ -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 *~