Merge pull request #1 from shym/polish-stm-threads

Polish ocaml-multicore#88

Author: n-osborne

lib/STM_domain.mli

@@ -15,10 +15,10 @@ module Make : functor (Spec : STM_spec.Spec) ->
     val agree_prop_par : Spec.cmd list * Spec.cmd list * Spec.cmd list -> bool
     (** Parallel agreement property based on [Domain] *)
 
-    val agree_test_par : count:int -> name:string -> QCheck2.Test.t
+    val agree_test_par : count:int -> name:string -> QCheck.Test.t
     (** Parallel agreement test based on [Domain] which combines [repeat] and [~retries] *)
 
-    val neg_agree_test_par : count:int -> name:string -> QCheck2.Test.t
+    val neg_agree_test_par : count:int -> name:string -> QCheck.Test.t
     (** An negative agreement test (for convenience). Accepts two labeled parameters:
         [count] is the test count and [name] is the printed test name. *)
 

lib/STM_sequential.mli

@@ -27,7 +27,7 @@ module Make : functor (Spec : STM_spec.Spec) ->
         when interpreted from the model's initial state and the [sut]'s initial state.
         Cleans up after itself by calling [Spec.cleanup] *)
 
-    val agree_test : count:int -> name:string -> QCheck2.Test.t
+    val agree_test : count:int -> name:string -> QCheck.Test.t
     (** An actual agreement test (for convenience). Accepts two labeled parameters:
         [count] is the test count and [name] is the printed test name. *)
 

lib/STM_thread.mli

@@ -11,10 +11,10 @@ module Make : functor (Spec : STM_spec.Spec) ->
     val agree_prop_conc : Spec.cmd list * Spec.cmd list * Spec.cmd list -> bool
     (** Concurrent agreement property based on [Thread] *)
 
-    val agree_test_conc : count:int -> name:string -> QCheck2.Test.t
+    val agree_test_conc : count:int -> name:string -> QCheck.Test.t
     (** Concurrent agreement test based on [Thread] which combines [repeat] and [~retries] *)
 
-    val neg_agree_test_conc : count:int -> name:string -> QCheck2.Test.t
+    val neg_agree_test_conc : count:int -> name:string -> QCheck.Test.t
     (** An negative agreement test (for convenience). Accepts two labeled parameters:
         [count] is the test count and [name] is the printed test name. *)
 

src/array/dune

@@ -12,7 +12,7 @@
 (executable
  (name stm_tests)
  (modules stm_tests)
- (libraries qcheck-stm.base qcheck-stm.sequential qcheck-stm.domain)
+ (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show)))
 
 (rule

src/array/stm_tests.ml

@@ -103,14 +103,14 @@ struct
     | _, _ -> false
 end
 
-module ArraySTM_Seq = STM_sequential.Make(AConf)
-module ArraySTM_Dom = STM_domain.Make(AConf)
+module ArraySTM_seq = STM_sequential.Make(AConf)
+module ArraySTM_dom = STM_domain.Make(AConf)
 
 ;;
 Util.set_ci_printing ()
 ;;
 QCheck_base_runner.run_tests_main
   (let count = 1000 in
-   [ArraySTM_Seq.agree_test         ~count ~name:"STM Array test sequential";
-    ArraySTM_Dom.neg_agree_test_par ~count ~name:"STM Array test parallel" (* this test is expected to fail *)
+   [ArraySTM_seq.agree_test         ~count ~name:"STM Array test sequential";
+    ArraySTM_dom.neg_agree_test_par ~count ~name:"STM Array test parallel" (* this test is expected to fail *)
 ])

src/atomic/dune

@@ -12,7 +12,7 @@
 (executable
  (name stm_tests)
  (modules stm_tests)
- (libraries qcheck-stm.base qcheck-stm.sequential qcheck-stm.domain)
+ (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show)))
 
 (rule

src/atomic/stm_tests.ml

@@ -66,12 +66,12 @@ struct
     | _,_ -> false
 end
 
-module AT_Seq = STM_sequential.Make(CConf)
-module AT_Dom = STM_domain.Make(CConf)
+module AT_seq = STM_sequential.Make(CConf)
+module AT_dom = STM_domain.Make(CConf)
 ;;
 Util.set_ci_printing ()
 ;;
 QCheck_base_runner.run_tests_main
-  (let count = 1000 in
-   [AT_Seq.agree_test     ~count ~name:"STM Atomic test sequential";
-    AT_Dom.agree_test_par ~count ~name:"STM Atmoic test parallel";])
+  (let count = 250 in
+   [AT_seq.agree_test     ~count ~name:"STM Atomic test sequential";
+    AT_dom.agree_test_par ~count ~name:"STM Atmoic test parallel";])

src/bigarray/dune

@@ -15,7 +15,7 @@
 (executable
  (name stm_tests)
  (modules stm_tests)
- (libraries qcheck-stm.base qcheck-stm.sequential qcheck-stm.domain)
+ (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess
   (pps ppx_deriving.show)))
 

src/buffer/dune

@@ -9,7 +9,7 @@
 (executable
  (name stm_tests)
  (modules stm_tests)
- (libraries qcheck-stm.base qcheck-stm.sequential qcheck-stm.domain)
+ (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show)))
 
 (rule

src/buffer/stm_tests.ml

@@ -125,13 +125,13 @@ struct
     | _, _ -> false
 end
 
-module BufferSTM_Seq = STM_sequential.Make(BConf)
-module BufferSTM_Dom = STM_domain.Make(BConf)
+module BufferSTM_seq = STM_sequential.Make(BConf)
+module BufferSTM_dom = STM_domain.Make(BConf)
 
 ;;
 Util.set_ci_printing ()
 ;;
 QCheck_base_runner.run_tests_main
-  (let count = 100 in
-   [BufferSTM_Seq.agree_test         ~count ~name:"STM Buffer test sequential";
-    BufferSTM_Dom.neg_agree_test_par ~count ~name:"STM Buffer test parallel"])
+  (let count = 1000 in
+   [BufferSTM_seq.agree_test         ~count ~name:"STM Buffer test sequential";
+    BufferSTM_dom.neg_agree_test_par ~count ~name:"STM Buffer test parallel"])