From 71794d8d457af9821d5258f32435213e4de0923d Mon Sep 17 00:00:00 2001 From: Simon Cruanes Date: Sun, 20 Mar 2016 16:02:11 +0100 Subject: [PATCH] migrate to new qtest --- .merlin | 2 +- _oasis | 4 ++-- benchs/run_benchs.ml | 2 +- src/core/CCRandom.ml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.merlin b/.merlin index 776492dd..f9975114 100644 --- a/.merlin +++ b/.merlin @@ -26,5 +26,5 @@ PKG bigarray PKG sequence PKG hamt PKG gen -PKG QTest2Lib +PKG qcheck FLG -w +a -w -4 -w -44 diff --git a/_oasis b/_oasis index 700291cd..23277415 100644 --- a/_oasis +++ b/_oasis @@ -155,7 +155,7 @@ Executable run_benchs CompiledObject: best Build$: flag(bench) MainIs: run_benchs.ml - BuildDepends: containers, containers.advanced, QTest2Lib, + BuildDepends: containers, containers.advanced, qcheck, containers.data, containers.string, containers.iter, containers.thread, sequence, gen, benchmark, hamt @@ -179,7 +179,7 @@ Executable run_qtest containers.io, containers.advanced, containers.sexp, containers.bigarray, containers.unix, containers.thread, containers.data, - sequence, gen, unix, oUnit, QTest2Lib + sequence, gen, unix, oUnit, qcheck Test all Command: ./run_qtest.native diff --git a/benchs/run_benchs.ml b/benchs/run_benchs.ml index aabc99f6..e22b7ce5 100644 --- a/benchs/run_benchs.ml +++ b/benchs/run_benchs.ml @@ -1157,7 +1157,7 @@ end module Str = struct (* random string, but always returns the same for a given size *) let rand_str_ ?(among="abcdefgh") n = - let module Q = Quickcheck in + let module Q = QCheck in let st = Random.State.make [| n + 17 |] in let gen_c = Q.Gen.oneofl (CCString.to_list among) in Q.Gen.string_size ~gen:gen_c (Q.Gen.return n) st diff --git a/src/core/CCRandom.ml b/src/core/CCRandom.ml index 9e0ad1fe..ed8ed0a4 100644 --- a/src/core/CCRandom.ml +++ b/src/core/CCRandom.ml @@ -213,5 +213,5 @@ let uniformity_test ?(size_hint=10) k rng st = Hashtbl.fold predicate histogram true (*$T split_list - run ~st:(Runner.random_state()) ( uniformity_test 50_000 (split_list 10 ~len:3) ) + run ~st:(QCheck_runner.random_state()) ( uniformity_test 50_000 (split_list 10 ~len:3) ) *)