Commit 1b117581 authored by MARTINEZ Thierry 's avatar MARTINEZ Thierry

Fixed: Restore initial verbosity to normal

swipl "-q" option changed both the verbosity of the compilation and the
initial runtime verbose flag. This caused plunit not to print unit names
until the verbosity was restored to normal (e.g., by the
conservation_laws unit tests). I suppose that it was unattended.

Some minor fixes in coding style.
parent e9dce86a
......@@ -28,14 +28,19 @@ quick: unit_tests
.PHONY: all slow test unit_tests doc clean
biocham: platform/current swipl-biocham $(MODULES) toc.org Makefile
biocham: platform/current $(SWIPL) $(MODULES) toc.org Makefile
$(SWIPL) -q -o biocham \
--goal=start --toplevel=toplevel -c $(MODULES)
--goal="\
set_prolog_flag(verbose, normal), \
start" \
--toplevel=toplevel -c $(MODULES)
biocham_debug: platform/current swipl-biocham $(MODULES) $(TEST_MODULES) \
biocham_debug: platform/current $(SWIPL) $(MODULES) $(TEST_MODULES) \
toc.org Makefile
$(SWIPL) -o biocham_debug \
--goal='(leash(-all),leash(+call),initialize)' -c $(MODULES) $(TEST_MODULES)
$(SWIPL) -q -o biocham_debug \
--goal="\
set_prolog_flag(verbose, normal), \
initialize" -c $(MODULES) $(TEST_MODULES)
swipl-biocham: swipl-biocham.o \
......@@ -64,17 +69,34 @@ unit_tests: biocham_tests
doc: biocham
./biocham --generate-doc
biocham_tests: swipl-biocham $(MODULES) $(TEST_MODULES) Makefile
biocham_tests: $(SWIPL) $(MODULES) $(TEST_MODULES) Makefile
$(SWIPL) -q -o biocham_tests \
--goal="call_cleanup((run_tests, halt(0)), halt(1))" \
--goal="\
call_cleanup( \
( \
set_prolog_flag(verbose, normal), \
run_tests, \
halt(0) \
), \
halt(1) \
)" \
-c $(MODULES) $(TEST_MODULES)
test: biocham_full_tests
./biocham_full_tests
biocham_full_tests: swipl-biocham $(MODULES) $(TEST_MODULES) Makefile
biocham_full_tests: $(SWIPL) $(MODULES) $(TEST_MODULES) Makefile
$(SWIPL) -q -o biocham_full_tests \
--goal="call_cleanup((flag(slow_test, _, true), run_tests, halt(0)), halt(1))" \
--goal="\
call_cleanup( \
( \
flag(slow_test, _, true), \
set_prolog_flag(verbose, normal), \
run_tests, \
halt(0) \
), \
halt(1) \
)" \
-c $(MODULES) $(TEST_MODULES)
jupyter: biocham
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment