update makes

This commit is contained in:
Danya Berezun 2023-09-05 20:55:48 +02:00
parent da9bff2045
commit 20cb055883
4 changed files with 17 additions and 10 deletions

View file

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

View file

@ -21,10 +21,21 @@ uninstall:
$(RM) -r `opam var share`/Lama $(RM) -r `opam var share`/Lama
$(RM) `opam var bin`/$(EXECUTABLE) $(RM) `opam var bin`/$(EXECUTABLE)
regression-all: regression regression-expressions regression-lama-in-lama
regression: regression:
$(MAKE) clean check -j8 -C regression $(MAKE) clean check -j8 -C regression
$(MAKE) clean check -j8 -C stdlib/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 $(MAKE) -C lama-compiler
clean: clean:

View file

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

View file

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