From 5a9efba584b053c85b61d8b61c078f3eb194907d Mon Sep 17 00:00:00 2001 From: Claire Wolf Date: Fri, 24 Jul 2020 14:58:23 +0200 Subject: [PATCH] Improvements in "make test" Signed-off-by: Claire Wolf --- Makefile | 17 ++++++++++++----- docs/examples/puzzles/.gitignore | 1 + 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index cafcc3f..790170b 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,9 @@ test: \ test_puzzles_primegen_primegen test_puzzles_primegen_primes_pass test_puzzles_primegen_primes_fail \ test_quickstart_demo test_quickstart_cover test_quickstart_prove test_quickstart_memory \ run_tests + if yosys -qp 'read -verific' 2> /dev/null; then set -x; \ + YOSYS_NOVERIFIC=1 $(MAKE) test; \ + fi test_demo1: cd sbysrc && python3 sby.py -f demo1.sby @@ -57,10 +60,14 @@ test_demo3: cd sbysrc && python3 sby.py -f demo3.sby test_abstract_abstr: - cd docs/examples/abstract && python3 ../../../sbysrc/sby.py -f abstr.sby + @if yosys -qp 'read -verific' 2> /dev/null; then set -x; \ + cd docs/examples/abstract && python3 ../../../sbysrc/sby.py -f abstr.sby; \ + else echo "skipping $@"; fi test_abstract_props: - cd docs/examples/abstract && python3 ../../../sbysrc/sby.py -f props.sby + if yosys -qp 'read -verific' 2> /dev/null; then set -x; \ + cd docs/examples/abstract && python3 ../../../sbysrc/sby.py -f props.sby; \ + else echo "skipping $@"; fi test_demos_fib_cover: cd docs/examples/demos && python3 ../../../sbysrc/sby.py -f fib.sby cover @@ -105,11 +112,11 @@ test_quickstart_memory: cd docs/examples/quickstart && python3 ../../../sbysrc/sby.py -f memory.sby run_tests: - make -C tests test + $(MAKE) -C tests test html: - make -C docs html + $(MAKE) -C docs html clean: - make -C docs clean + $(MAKE) -C docs clean rm -rf docs/build sbysrc/sby sbysrc/__pycache__ diff --git a/docs/examples/puzzles/.gitignore b/docs/examples/puzzles/.gitignore index e14320c..1913d39 100644 --- a/docs/examples/puzzles/.gitignore +++ b/docs/examples/puzzles/.gitignore @@ -1,3 +1,4 @@ +/pour_853_to_4 /wolf_goat_cabbage /primegen_primegen /primegen_primes_pass -- 2.30.2