From 14f593d246b749ff987eca534237e83ac1977083 Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Wed, 25 Feb 2015 21:58:34 +0100 Subject: [PATCH] wip: qtests for containers.lwt --- Makefile | 17 ++++++++++++++++- _oasis | 16 ++++++++++++++++ src/lwt/lwt_klist.ml | 4 ++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index d2288b04..a7079cec 100644 --- a/Makefile +++ b/Makefile @@ -75,10 +75,16 @@ QTESTABLE=$(filter-out $(DONTTEST), \ $(wildcard src/bigarray/*.mli) \ ) +QTESTABLE_LWT=$(filter-out $(DONTTEST), \ + $(wildcard src/lwt/*.ml) \ + $(wildcard src/lwt/*.mli) \ + ) + qtest-clean: @rm -rf qtest/ QTEST_PREAMBLE='open CCFun;; ' +QTEST_LWT_PREAMBLE=$(QTEST_PREAMBLE) #qtest-build: qtest-clean build # @mkdir -p qtest @@ -89,7 +95,7 @@ QTEST_PREAMBLE='open CCFun;; ' # -I core -I misc -I string \ # qtest/qtest_all.native -qtest-gen: qtest-clean +qtest-gen: @mkdir -p qtest @if which qtest > /dev/null ; then \ qtest extract --preamble $(QTEST_PREAMBLE) \ @@ -98,6 +104,15 @@ qtest-gen: qtest-clean else touch qtest/run_qtest.ml ; \ fi +qtest-lwt-gen: + @mkdir -p qtest/lwt/ + @if which qtest > /dev/null ; then \ + qtest extract --preamble $(QTEST_LWT_PREAMBLE) \ + -o qtest/lwt/run_qtest_lwt.ml \ + $(QTESTABLE_LWT) 2> /dev/null ; \ + else touch qtest/lwt/run_qtest_lwt.ml ; \ + fi + push-stable: git checkout stable git merge master -m 'merge from master' diff --git a/_oasis b/_oasis index f3113494..9fc9f4aa 100644 --- a/_oasis +++ b/_oasis @@ -199,6 +199,18 @@ Executable run_qtest containers.bigarray, sequence, gen, oUnit, QTest2Lib +PreBuildCommand: make qtest-lwt-gen + +Executable run_qtest_lwt + Path: qtest/lwt/ + Install: false + CompiledObject: best + MainIs: run_qtest_lwt.ml + Build$: flag(tests) && flag(lwt) + BuildDepends: containers, containers.lwt, lwt, lwt.unix, + sequence, gen, oUnit, QTest2Lib + + Executable run_tests Path: tests/ Install: false @@ -213,6 +225,10 @@ Test all TestTools: run_tests, run_qtest Run$: flag(tests) && flag(misc) +Test lwt + Command: echo "test lwt"; ./run_qtest_lwt.native + Run$: flag(tests) && flag(lwt) + Executable lambda Path: examples/ Install: false diff --git a/src/lwt/lwt_klist.ml b/src/lwt/lwt_klist.ml index 59bba1d9..bf651830 100644 --- a/src/lwt/lwt_klist.ml +++ b/src/lwt/lwt_klist.ml @@ -212,3 +212,7 @@ let to_rev_list l = let to_list l = to_rev_list l >|= List.rev +(*$Q + (Q.list Q.int) (fun l -> Lwt_main.run (of_list l |> to_list) = l) +*) +