make test will now run both oUnit and qtest

This commit is contained in:
Simon Cruanes 2014-06-25 01:26:53 +02:00
parent a87a5b0315
commit 2395ebb2ad
2 changed files with 10 additions and 4 deletions

View file

@ -62,12 +62,14 @@ QTESTABLE=$(filter-out $(DONTTEST), \
qtest-clean: qtest-clean:
@rm -rf qtest/ @rm -rf qtest/
qtest: qtest-clean build qtest-build: qtest-clean build
@mkdir -p qtest @mkdir -p qtest
@qtest extract -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null @qtest extract -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null
@ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib \ @ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib \
-I core -I misc -I string \ -I core -I misc -I string \
qtest/qtest_all.native qtest/qtest_all.native
qtest: qtest-build
@echo @echo
./qtest_all.native ./qtest_all.native
@ -79,7 +81,11 @@ push-stable: all
git push origin git push origin
git checkout master git checkout master
test-all: test qtest run-test: build qtest-build
./qtest_all.native
./run_tests.native
test-all: run-test qtest
tags: tags:
otags *.ml *.mli otags *.ml *.mli

2
_oasis
View file

@ -179,7 +179,7 @@ Executable test_threads
BuildDepends: containers,threads,oUnit,containers.lwt BuildDepends: containers,threads,oUnit,containers.lwt
Test all Test all
Command: $run_tests Command: make test-all
TestTools: run_tests TestTools: run_tests
Run$: flag(tests) Run$: flag(tests)