This commit is contained in:
Simon Cruanes 2015-01-25 23:39:03 +01:00
parent 186f4a93ce
commit 8b34fb9ef1
2 changed files with 4 additions and 4 deletions

2
opam
View file

@ -6,7 +6,7 @@ maintainer: "simon.cruanes@inria.fr"
build: [ build: [
["./configure" ["./configure"
"--prefix" prefix "--prefix" prefix
"--disable-thread" "--%{base-threads:enable%}-thread"
"--disable-bench" "--disable-bench"
"--disable-tests" "--disable-tests"
"--%{lwt:enable}%-lwt" "--%{lwt:enable}%-lwt"

View file

@ -59,13 +59,13 @@ let test_time () =
let test_timer () = let test_timer () =
let timer = Future.Timer.create () in let timer = Future.Timer.create () in
let n = CCLock.create 1 in let n = CCLock.create 1 in
let get = Future.make (fun () -> Thread.delay 0.7; CCLock.get n) in let get = Future.make (fun () -> Thread.delay 0.8; CCLock.get n) in
let _ = let _ =
Future.Timer.after timer 0.5 Future.Timer.after timer 0.6
>>= fun () -> CCLock.update n (fun x -> x+2); Future.return() >>= fun () -> CCLock.update n (fun x -> x+2); Future.return()
in in
let _ = let _ =
Future.Timer.after timer 0.2 Future.Timer.after timer 0.4
>>= fun () -> CCLock.update n (fun x -> x * 4); Future.return() >>= fun () -> CCLock.update n (fun x -> x * 4); Future.return()
in in
OUnit.assert_equal 6 (Future.get get); OUnit.assert_equal 6 (Future.get get);