From d0af6abbd950b1b39c85753d1b18e0d154f15b44 Mon Sep 17 00:00:00 2001
From: Simon Cruanes <simon.cruanes.2007@m4x.org>
Date: Wed, 17 Dec 2014 10:22:19 +0100
Subject: [PATCH] fixed qtests

---
 Makefile | 28 +++++++++++++++++++---------
 _oasis   |  3 ++-
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index a2f236e3..a52e9d42 100644
--- a/Makefile
+++ b/Makefile
@@ -59,12 +59,22 @@ push_doc: doc
 	scp -r containers_misc.docdir/* cedeela.fr:~/simon/root/software/containers/misc/
 	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), \
-	$(wildcard core/*.ml) $(wildcard core/*.mli) \
-	$(wildcard core/*.cppo.ml) $(wildcard core/*.cppo.mli) \
-	$(wildcard misc/*.ml) $(wildcard misc/*.mli) \
-	$(wildcard string/*.ml) $(wildcard string/*.mli) \
+	$(wildcard src/core/*.ml) \
+	$(wildcard src/core/*.mli) \
+	$(wildcard src/data/*.ml) \
+	$(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:
@@ -83,11 +93,11 @@ QTEST_PREAMBLE='open CCFun;; '
 
 qtest-gen: qtest-clean
 	@mkdir -p qtest
-	@if which qtest ; then \
+	@if which qtest > /dev/null ; then \
 		qtest extract --preamble $(QTEST_PREAMBLE) \
-			-o qtest/run_qtest.cppo.ml \
+			-o qtest/run_qtest.ml \
 			$(QTESTABLE) 2> /dev/null ; \
-	else touch qtest/run_qtest.cppo.ml ; \
+	else touch qtest/run_qtest.ml ; \
 	fi
 
 push-stable:
@@ -120,4 +130,4 @@ update_next_tag:
 udpate_sequence:
 	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
diff --git a/_oasis b/_oasis
index 95e1a1a1..b0270f89 100644
--- a/_oasis
+++ b/_oasis
@@ -195,7 +195,8 @@ Executable run_qtest
   CompiledObject:   native
   MainIs:           run_qtest.ml
   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
 
 Executable run_tests