From 2395ebb2adf09f2cb88ff93fb60211817120b05b Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 25 Jun 2014 01:26:53 +0200 Subject: [PATCH] make test will now run both oUnit and qtest --- Makefile | 12 +++++++++--- _oasis | 2 +- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 5751211b..8ebd6c85 100644 --- a/Makefile +++ b/Makefile @@ -62,13 +62,15 @@ QTESTABLE=$(filter-out $(DONTTEST), \ qtest-clean: @rm -rf qtest/ -qtest: qtest-clean build +qtest-build: qtest-clean build @mkdir -p qtest @qtest extract -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null @ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib \ -I core -I misc -I string \ qtest/qtest_all.native - @echo + +qtest: qtest-build + @echo ./qtest_all.native push-stable: all @@ -79,7 +81,11 @@ push-stable: all git push origin git checkout master -test-all: test qtest +run-test: build qtest-build + ./qtest_all.native + ./run_tests.native + +test-all: run-test qtest tags: otags *.ml *.mli diff --git a/_oasis b/_oasis index bc8324f0..80b0eacc 100644 --- a/_oasis +++ b/_oasis @@ -179,7 +179,7 @@ Executable test_threads BuildDepends: containers,threads,oUnit,containers.lwt Test all - Command: $run_tests + Command: make test-all TestTools: run_tests Run$: flag(tests)