simon/ocaml-containers
1
0
Fork 0
mirror of https://github.com/c-cube/ocaml-containers.git synced 2025-12-06 03:05:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix tests by making oasis build qtest itself

Browse source
This commit is contained in:
Simon Cruanes 2014-11-04 16:44:15 +01:00
parent 611086e6ab
commit d3af230de9
2 changed files with 30 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Makefile
View file

@ -47,7 +47,7 @@ setup.exe: setup.ml
EXAMPLES = examples/mem_size.native examples/collatz.native \ EXAMPLES = examples/mem_size.native examples/collatz.native \
examples/bencode_write.native # examples/crawl.native examples/bencode_write.native # examples/crawl.native
OPTIONS = -use-ocamlfind OPTIONS = -use-ocamlfind -I _build
examples: all examples: all
ocamlbuild $(OPTIONS) -package unix -I . $(EXAMPLES) ocamlbuild $(OPTIONS) -package unix -I . $(EXAMPLES)
@ -58,7 +58,7 @@ push_doc: doc
scp -r containers_advanced.docdir/* cedeela.fr:~/simon/root/software/containers/advanced scp -r containers_advanced.docdir/* cedeela.fr:~/simon/root/software/containers/advanced
scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/ scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/
DONTTEST=myocamlbuild.ml setup.ml DONTTEST=myocamlbuild.ml setup.ml $(wildcard **/*.cppo*)
QTESTABLE=$(filter-out $(DONTTEST), \ QTESTABLE=$(filter-out $(DONTTEST), \
$(wildcard core/*.ml) $(wildcard core/*.mli) \ $(wildcard core/*.ml) $(wildcard core/*.mli) \
$(wildcard misc/*.ml) $(wildcard misc/*.mli) \ $(wildcard misc/*.ml) $(wildcard misc/*.mli) \
@ -70,16 +70,16 @@ qtest-clean:
QTEST_PREAMBLE='open CCFun;; ' QTEST_PREAMBLE='open CCFun;; '
qtest-build: qtest-clean build #qtest-build: qtest-clean build
@mkdir -p qtest # @mkdir -p qtest
@qtest extract --preamble $(QTEST_PREAMBLE) -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null # @qtest extract --preamble $(QTEST_PREAMBLE) -o qtest/qtest_all.ml $(QTESTABLE) 2> /dev/null
@ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib \ # @ocamlbuild $(OPTIONS) -pkg oUnit,QTest2Lib,ocamlbuildlib \
-I core -I misc -I string \ # -I core -I misc -I string \
qtest/qtest_all.native # qtest/qtest_all.native
qtest: qtest-build qtest-gen: qtest-clean
@echo @mkdir -p qtest
./qtest_all.native @qtest extract --preamble $(QTEST_PREAMBLE) -o qtest/run_qtest.ml $(QTESTABLE) 2> /dev/null
push-stable: push-stable:
git checkout stable git checkout stable
@ -92,11 +92,11 @@ push-stable:
clean-generated: clean-generated:
rm **/*.{mldylib,mlpack,mllib} myocamlbuild.ml -f rm **/*.{mldylib,mlpack,mllib} myocamlbuild.ml -f
run-test: build qtest-build run-test: build
./qtest_all.native ./run_qtest.native
./run_tests.native ./run_tests.native
test-all: run-test qtest test-all: run-test
tags: tags:
otags *.ml *.mli otags *.ml *.mli

21
_oasis
View file

@ -208,10 +208,16 @@ Executable test_threads
MainIs: test_Future.ml MainIs: test_Future.ml
BuildDepends: containers,threads,oUnit,containers.lwt BuildDepends: containers,threads,oUnit,containers.lwt
Test all PreBuildCommand: make qtest-gen
Command: make test-all
TestTools: run_tests Executable run_qtest
Run$: flag(tests) Path: qtest/
Install: false
CompiledObject: native
MainIs: run_qtest.ml
Build$: flag(tests)
BuildDepends: containers, containers.misc, containers.string,
oUnit, QTest2Lib
Executable run_tests Executable run_tests
Path: tests/ Path: tests/
@ -219,7 +225,12 @@ Executable run_tests
CompiledObject: native CompiledObject: native
MainIs: run_tests.ml MainIs: run_tests.ml
Build$: flag(tests) && flag(misc) Build$: flag(tests) && flag(misc)
BuildDepends: containers,oUnit,qcheck,containers.misc BuildDepends: containers, oUnit, qcheck, containers.misc
Test all
Command: make test-all
TestTools: run_tests, run_qtest
Run$: flag(tests) && flag(misc)
Executable web_pwd Executable web_pwd
Path: examples/cgi/ Path: examples/cgi/