fixed qtests

This commit is contained in:
Simon Cruanes 2014-12-17 10:22:19 +01:00
parent e7cd24b903
commit d0af6abbd9
2 changed files with 21 additions and 10 deletions

View file

@ -59,12 +59,22 @@ push_doc: doc
scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/ scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/
scp -r containers_lwt.docdir/* cedeela.fr:~/simon/root/software/containers/lwt/ scp -r containers_lwt.docdir/* cedeela.fr:~/simon/root/software/containers/lwt/
DONTTEST=myocamlbuild.ml setup.ml $(wildcard **/*.cppo*) DONTTEST=myocamlbuild.ml setup.ml $(wildcard src/**/*.cppo.*)
QTESTABLE=$(filter-out $(DONTTEST), \ QTESTABLE=$(filter-out $(DONTTEST), \
$(wildcard core/*.ml) $(wildcard core/*.mli) \ $(wildcard src/core/*.ml) \
$(wildcard core/*.cppo.ml) $(wildcard core/*.cppo.mli) \ $(wildcard src/core/*.mli) \
$(wildcard misc/*.ml) $(wildcard misc/*.mli) \ $(wildcard src/data/*.ml) \
$(wildcard string/*.ml) $(wildcard string/*.mli) \ $(wildcard src/data/*.mli) \
$(wildcard src/string/*.ml) \
$(wildcard src/string/*.mli) \
$(wildcard src/io/*.ml) \
$(wildcard src/io/*.mli) \
$(wildcard src/sexp/*.ml) \
$(wildcard src/sexp/*.mli) \
$(wildcard src/advanced/*.ml) \
$(wildcard src/advanced/*.mli) \
$(wildcard src/iter/*.ml) \
$(wildcard src/iter/*.mli) \
) )
qtest-clean: qtest-clean:
@ -83,11 +93,11 @@ QTEST_PREAMBLE='open CCFun;; '
qtest-gen: qtest-clean qtest-gen: qtest-clean
@mkdir -p qtest @mkdir -p qtest
@if which qtest ; then \ @if which qtest > /dev/null ; then \
qtest extract --preamble $(QTEST_PREAMBLE) \ qtest extract --preamble $(QTEST_PREAMBLE) \
-o qtest/run_qtest.cppo.ml \ -o qtest/run_qtest.ml \
$(QTESTABLE) 2> /dev/null ; \ $(QTESTABLE) 2> /dev/null ; \
else touch qtest/run_qtest.cppo.ml ; \ else touch qtest/run_qtest.ml ; \
fi fi
push-stable: push-stable:
@ -120,4 +130,4 @@ update_next_tag:
udpate_sequence: udpate_sequence:
git subtree pull --prefix sequence sequence stable --squash git subtree pull --prefix sequence sequence stable --squash
.PHONY: examples push_doc tags qtest update_sequence update_next_tag .PHONY: examples push_doc tags qtest-gen qtest-clean update_sequence update_next_tag

3
_oasis
View file

@ -195,7 +195,8 @@ Executable run_qtest
CompiledObject: native CompiledObject: native
MainIs: run_qtest.ml MainIs: run_qtest.ml
Build$: flag(tests) Build$: flag(tests)
BuildDepends: containers, containers.misc, containers.string, BuildDepends: containers, containers.misc, containers.string, containers.iter,
containers.io, containers.advanced, containers.sexp,
sequence, gen, oUnit, QTest2Lib sequence, gen, oUnit, QTest2Lib
Executable run_tests Executable run_tests