Merge pull request #396 from ocaml-multicore/lin-renaming

Chore: renaming Lin Internal tests

Author: jmid

src/README.md

@@ -44,10 +44,10 @@ Tests utilizing the parallel STM.ml capability:
 
 Tests utilizing the linearization tests of Lin.ml:
 
- - [array/lin_tests.ml](array/lin_tests.ml) and [array/lin_tests_dsl.ml](array/lin_tests_dsl.ml)
+ - [array/lin_internal_tests.ml](array/lin_internal_tests.ml) and [array/lin_tests_dsl.ml](array/lin_tests_dsl.ml)
    contain experimental `Lin.Internal` and `Lin`-tests of `Array`
 
- - [atomic/lin_tests.ml](atomic/lin_tests.ml) and [atomic/lin_tests_dsl.ml](atomic/lin_tests_dsl.ml)
+ - [atomic/lin_internal_tests.ml](atomic/lin_internal_tests.ml) and [atomic/lin_tests_dsl.ml](atomic/lin_tests_dsl.ml)
    contain experimental `Lin.Internal` and `Lin`-tests of `Atomic`
 
  - [bigarray/lin_tests_dsl.ml](bigarray/lin_tests_dsl.ml) contains experimental `Lin`-tests of `Bigarray`
@@ -58,16 +58,16 @@ Tests utilizing the linearization tests of Lin.ml:
 
  - [floatarray/lin_tests_dsl.ml](floatarray/lin_tests_dsl.ml) contains experimental `Lin`-tests of `Float.Array`
 
- - [hashtbl/lin_tests.ml](hashtbl/lin_tests.ml) and [hashtbl/lin_tests_dsl.ml](hashtbl/lin_tests_dsl.ml)
+ - [hashtbl/lin_internal_tests.ml](hashtbl/lin_internal_tests.ml) and [hashtbl/lin_tests_dsl.ml](hashtbl/lin_tests_dsl.ml)
    contain experimental `Lin.Internal` and `Lin`-tests of `Hashtbl`
 
- - [lazy/lin_tests.ml](lazy/lin_tests.ml) and [lazy/lin_tests_dsl.ml](lazy/lin_tests_dsl.ml)
+ - [lazy/lin_internal_tests.ml](lazy/lin_internal_tests.ml) and [lazy/lin_tests_dsl.ml](lazy/lin_tests_dsl.ml)
    contain experimental `Lin.Internal` and `Lin`-tests of `Lazy`
 
- - [queue/lin_tests.ml](queue/lin_tests.ml) and [queue/lin_tests_dsl.ml](queue/lin_tests_dsl.ml)
+ - [queue/lin_internal_tests.ml](queue/lin_internal_tests.ml) and [queue/lin_tests_dsl.ml](queue/lin_tests_dsl.ml)
    contain experimental `Lin.Internal` and `Lin`-tests of `Queue`
 
- - [stack/lin_tests.ml](stack/lin_tests.ml) and [stack/lin_tests_dsl.ml](stack/lin_tests_dsl.ml)
+ - [stack/lin_internal_tests.ml](stack/lin_internal_tests.ml) and [stack/lin_tests_dsl.ml](stack/lin_tests_dsl.ml)
    contain experimental `Lin.Internal` and `Lin`-tests of `Stack`
 
 
@@ -96,7 +96,7 @@ that concurrency issues are indeed found as expected (aka. sanity
 check).
 
 For `Lin.Internal` and `Lin`
-- [neg_tests/lin_tests_common.ml](neg_tests/lin_tests_common.ml) and
+- [neg_tests/lin_internal_tests_common.ml](neg_tests/lin_internal_tests_common.ml) and
 - [neg_tests/lin_tests_dsl_common.ml](neg_tests/lin_tests_dsl_common.ml)
 
 contain "sanity check tests" for an unprotected global `ref` and a

src/array/dune

@@ -9,8 +9,8 @@
 )
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain)

src/array/lin_tests.ml renamed to src/array/lin_internal_tests.ml

@@ -118,5 +118,5 @@ end
 module AT_domain = Lin_domain.Make_internal(AConf) [@alert "-internal"]
 ;;
 QCheck_base_runner.run_tests_main [
-  AT_domain.neg_lin_test ~count:1000 ~name:"Lin Array test with Domain";
+  AT_domain.neg_lin_test ~count:1000 ~name:"Lin.Internal Array test with Domain";
 ]

src/atomic/dune

@@ -13,8 +13,8 @@
 ;; Linearization tests of Atomic, utilizing ppx_deriving_qcheck
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain)

src/atomic/lin_tests.ml renamed to src/atomic/lin_internal_tests.ml

@@ -190,6 +190,6 @@ end
 module A3T_domain = Lin_domain.Make_internal(A3Conf) [@alert "-internal"]
 ;;
 QCheck_base_runner.run_tests_main [
-  AT_domain.lin_test  ~count:1000 ~name:"Lin Atomic test with Domain";
-  A3T_domain.lin_test ~count:1000 ~name:"Lin Atomic3 test with Domain";
+  AT_domain.lin_test  ~count:1000 ~name:"Lin.Internal Atomic test with Domain";
+  A3T_domain.lin_test ~count:1000 ~name:"Lin.Internal Atomic3 test with Domain";
 ]

src/hashtbl/dune

@@ -9,8 +9,8 @@
 )
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain)

src/hashtbl/lin_tests.ml renamed to src/hashtbl/lin_internal_tests.ml

@@ -125,5 +125,5 @@ end
 module HT_domain = Lin_domain.Make_internal(HConf) [@alert "-internal"]
 ;;
 QCheck_base_runner.run_tests_main [
-  HT_domain.neg_lin_test ~count:1000 ~name:"Lin Hashtbl test with Domain";
+  HT_domain.neg_lin_test ~count:1000 ~name:"Lin.Internal Hashtbl test with Domain";
 ]

src/io/dune

@@ -1,8 +1,8 @@
 ;; Linearizability tests of the I/O operations
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  ;(flags (:standard -w -27))
  (libraries qcheck-lin.domain)

src/io/lin_tests.ml renamed to src/io/lin_internal_tests.ml

@@ -153,8 +153,8 @@ module Out_channel_lin = Lin_domain.Make_internal (Out_channel_ops) [@@alert "-i
 
 let () =
   QCheck_base_runner.run_tests_main
-    [ In_channel_lin.lin_test ~count:1000 ~name:"Lin In_channel test with domains";
-      Out_channel_lin.lin_test ~count:1000 ~name:"Lin Out_channel test with domains";
+    [ In_channel_lin.lin_test ~count:1000 ~name:"Lin.Internal In_channel test with domains";
+      Out_channel_lin.lin_test ~count:1000 ~name:"Lin.Internal Out_channel test with domains";
     ]
 
 let () =

src/lazy/dune

@@ -9,8 +9,8 @@
 )
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  (libraries qcheck-lin.domain)
  ; (action (run %{test} --verbose))

src/lazy/lin_tests.ml renamed to src/lazy/lin_internal_tests.ml

@@ -133,7 +133,7 @@ module LTfromfun = Lin_domain.Make_internal(struct
 ;;
 QCheck_base_runner.run_tests_main
   (let count = 100 in
-   [LTlazy.neg_lin_test       ~count ~name:"Lin Lazy test with Domain";
-    LTfromval.lin_test        ~count ~name:"Lin Lazy test with Domain from_val";
-    LTfromfun.neg_lin_test    ~count ~name:"Lin Lazy test with Domain from_fun";
+   [LTlazy.neg_lin_test       ~count ~name:"Lin.Internal Lazy test with Domain";
+    LTfromval.lin_test        ~count ~name:"Lin.Internal Lazy test with Domain from_val";
+    LTfromfun.neg_lin_test    ~count ~name:"Lin.Internal Lazy test with Domain from_fun";
    ])

src/neg_tests/dune

@@ -63,8 +63,8 @@
 )
 
 (library
- (name lin_tests_common)
- (modules lin_tests_common)
+ (name lin_internal_tests_common)
+ (modules lin_internal_tests_common)
  (package multicoretests)
  (libraries CList qcheck-lin.lin)
 )
@@ -100,30 +100,30 @@
 ;; Linearization tests of ref and Clist with Lin.Internal
 
 (test
- (name lin_tests_domain)
- (modules lin_tests_domain)
+ (name lin_internal_tests_domain)
+ (modules lin_internal_tests_domain)
  (package multicoretests)
  (flags (:standard -w -27))
- (libraries lin_tests_common qcheck-lin.domain)
+ (libraries lin_internal_tests_common qcheck-lin.domain)
   ; (action (run %{test} --verbose))
  (action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
 )
 
 (tests
- (names lin_tests_thread_ref lin_tests_thread_conclist)
- (modules lin_tests_thread_ref lin_tests_thread_conclist)
+ (names lin_internal_tests_thread_ref lin_internal_tests_thread_conclist)
+ (modules lin_internal_tests_thread_ref lin_internal_tests_thread_conclist)
  (package multicoretests)
  (flags (:standard -w -27))
- (libraries lin_tests_common qcheck-lin.thread)
+ (libraries lin_internal_tests_common qcheck-lin.thread)
  (action (run %{test} --verbose))
 )
 
 (test
- (name lin_tests_effect)
- (modules lin_tests_effect)
+ (name lin_internal_tests_effect)
+ (modules lin_internal_tests_effect)
  (package multicoretests)
  (flags (:standard -w -27))
- (libraries lin_tests_common qcheck-lin.effect)
+ (libraries lin_internal_tests_common qcheck-lin.effect)
   ; (action (run ./%{deps} --verbose))
  (action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
 )

src/neg_tests/lin_tests_common.ml renamed to src/neg_tests/lin_internal_tests_common.ml

@@ -1,4 +1,4 @@
-open Lin_tests_common
+open Lin_internal_tests_common
 
 module RT_int_domain = Lin_domain.Make_internal(RConf_int) [@alert "-internal"]
 module RT_int64_domain = Lin_domain.Make_internal(RConf_int64) [@alert "-internal"]
@@ -10,7 +10,7 @@ module CLT_int64_domain = Lin_domain.Make_internal(CLConf (Int64)) [@alert "-int
 ;;
 QCheck_base_runner.run_tests_main
   (let count = 15000 in
-   [RT_int_domain.neg_lin_test    ~count ~name:"Lin ref int test with Domain";
-    RT_int64_domain.neg_lin_test  ~count ~name:"Lin ref int64 test with Domain";
-    CLT_int_domain.neg_lin_test   ~count ~name:"Lin CList int test with Domain";
-    CLT_int64_domain.neg_lin_test ~count ~name:"Lin CList int64 test with Domain"])
+   [RT_int_domain.neg_lin_test    ~count ~name:"Lin.Internal ref int test with Domain";
+    RT_int64_domain.neg_lin_test  ~count ~name:"Lin.Internal ref int64 test with Domain";
+    CLT_int_domain.neg_lin_test   ~count ~name:"Lin.Internal CList int test with Domain";
+    CLT_int64_domain.neg_lin_test ~count ~name:"Lin.Internal CList int64 test with Domain"])

src/neg_tests/lin_tests_domain.ml renamed to src/neg_tests/lin_internal_tests_domain.ml

@@ -1,4 +1,4 @@
-open Lin_tests_common
+open Lin_internal_tests_common
 
 (** This is a driver of the negative tests over the Effect module *)
 
@@ -151,13 +151,13 @@ module CLT_int64'_effect = Lin_effect.Make_internal(CLConf_int64') [@alert "-int
 QCheck_base_runner.run_tests_main
   (let count = 20_000 in [
       (* We don't expect the first four tests to fail as each `cmd` is completed before a `Yield` *)
-      RT_int_effect.lin_test     ~count ~name:"Lin ref int test with Effect";
-      RT_int64_effect.lin_test   ~count ~name:"Lin ref int64 test with Effect";
-      CLT_int_effect.lin_test    ~count ~name:"Lin CList int test with Effect";
-      CLT_int64_effect.lin_test  ~count ~name:"Lin CList int64 test with Effect";
+      RT_int_effect.lin_test     ~count ~name:"Lin.Internal ref int test with Effect";
+      RT_int64_effect.lin_test   ~count ~name:"Lin.Internal ref int64 test with Effect";
+      CLT_int_effect.lin_test    ~count ~name:"Lin.Internal CList int test with Effect";
+      CLT_int64_effect.lin_test  ~count ~name:"Lin.Internal CList int64 test with Effect";
       (* These next four tests are negative - and are expected to fail with exception `Unhandled` *)
-      RT_int'_effect.neg_lin_test    ~count ~name:"negative Lin ref int test with Effect";
-      RT_int64'_effect.neg_lin_test  ~count ~name:"negative Lin ref int64 test with Effect";
-      CLT_int'_effect.neg_lin_test   ~count ~name:"negative Lin CList int test with Effect";
-      CLT_int64'_effect.neg_lin_test ~count ~name:"negative Lin CList int64 test with Effect"
+      RT_int'_effect.neg_lin_test    ~count ~name:"negative Lin.Internal ref int test with Effect";
+      RT_int64'_effect.neg_lin_test  ~count ~name:"negative Lin.Internal ref int64 test with Effect";
+      CLT_int'_effect.neg_lin_test   ~count ~name:"negative Lin.Internal CList int test with Effect";
+      CLT_int64'_effect.neg_lin_test ~count ~name:"negative Lin.Internal CList int64 test with Effect"
     ])

src/neg_tests/lin_tests_effect.ml renamed to src/neg_tests/lin_internal_tests_effect.ml

@@ -1,4 +1,4 @@
-open Lin_tests_common
+open Lin_internal_tests_common
 
 (** This is a driver of the negative CList tests over the Thread module *)
 
@@ -8,12 +8,12 @@ module CLT_int64_thread = Lin_thread.Make_internal(CLConf (Int64)) [@alert "-int
 let _ =
   let count = 1000 in
   let tests = [
-    CLT_int_thread.lin_test   ~count ~name:"Lin CList int test with Thread"; (* unboxed, hence no allocations to trigger context switch *)
-    CLT_int64_thread.lin_test ~count ~name:"Lin CList int64 test with Thread" (* not triggering context switch, unfortunately *)
+    CLT_int_thread.lin_test   ~count ~name:"Lin.Internal CList int test with Thread"; (* unboxed, hence no allocations to trigger context switch *)
+    CLT_int64_thread.lin_test ~count ~name:"Lin.Internal CList int64 test with Thread" (* not triggering context switch, unfortunately *)
   ] in
   let tests =
     if Sys.backend_type = Sys.Bytecode then (
-      Printf.printf "Lin CList int64 test with Thread disabled under bytecode\n\n%!";
+      Printf.printf "Lin.Internal CList int64 test with Thread disabled under bytecode\n\n%!";
       [ List.hd tests ])
     else tests
   in

src/neg_tests/lin_tests_thread_conclist.ml renamed to src/neg_tests/lin_internal_tests_thread_conclist.ml

@@ -1,4 +1,4 @@
-open Lin_tests_common
+open Lin_internal_tests_common
 
 (** This is a driver of the negative ref tests over the Thread module *)
 
@@ -11,9 +11,9 @@ module RT_int64_thread = Lin_thread.Make_internal(struct
 ;;
 if Sys.backend_type = Sys.Bytecode
 then
-  Printf.printf "Lin ref tests with Thread disabled under bytecode\n\n%!"
+  Printf.printf "Lin.Internal ref tests with Thread disabled under bytecode\n\n%!"
 else
 QCheck_base_runner.run_tests_main
   (let count = 1000 in
-   [RT_int_thread.lin_test       ~count       ~name:"Lin ref int test with Thread"; (* unboxed, hence no allocations to trigger context switch *)
-    RT_int64_thread.neg_lin_test ~count:15000 ~name:"Lin ref int64 test with Thread"])
+   [RT_int_thread.lin_test       ~count       ~name:"Lin.Internal ref int test with Thread"; (* unboxed, hence no allocations to trigger context switch *)
+    RT_int64_thread.neg_lin_test ~count:15000 ~name:"Lin.Internal ref int64 test with Thread"])

src/neg_tests/lin_tests_thread_ref.ml renamed to src/neg_tests/lin_internal_tests_thread_ref.ml

@@ -10,8 +10,8 @@
 )
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain qcheck-lin.thread)

src/queue/dune

@@ -171,8 +171,8 @@ module QT_domain  = Lin_domain.Make_internal(QConf) [@alert "-internal"]
 module QT_thread  = Lin_thread.Make_internal(QConf) [@alert "-internal"]
 ;;
 QCheck_base_runner.run_tests_main [
-    QMT_domain.lin_test    ~count:1000 ~name:"Lin Queue test with Domain and mutex";
-    QMT_thread.lin_test    ~count:1000 ~name:"Lin Queue test with Thread and mutex";
-    QT_domain.neg_lin_test ~count:1000 ~name:"Lin Queue test with Domain without mutex";
-    QT_thread.lin_test     ~count:1000 ~name:"Lin Queue test with Thread without mutex";
+    QMT_domain.lin_test    ~count:1000 ~name:"Lin.Internal Queue test with Domain and mutex";
+    QMT_thread.lin_test    ~count:1000 ~name:"Lin.Internal Queue test with Thread and mutex";
+    QT_domain.neg_lin_test ~count:1000 ~name:"Lin.Internal Queue test with Domain without mutex";
+    QT_thread.lin_test     ~count:1000 ~name:"Lin.Internal Queue test with Thread without mutex";
   ]

src/queue/lin_tests.ml renamed to src/queue/lin_internal_tests.ml

@@ -10,8 +10,8 @@
 )
 
 (test
- (name lin_tests)
- (modules lin_tests)
+ (name lin_internal_tests)
+ (modules lin_internal_tests)
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain qcheck-lin.thread)

src/stack/dune

@@ -171,8 +171,8 @@ module SMT_domain = Lin_domain.Make_internal(SMutexConf) [@alert "-internal"]
 module SMT_thread = Lin_thread.Make_internal(SMutexConf) [@alert "-internal"]
 ;;
 QCheck_base_runner.run_tests_main [
-    SMT_domain.lin_test    ~count:1000 ~name:"Lin Stack test with Domain and mutex";
-    SMT_thread.lin_test    ~count:1000 ~name:"Lin Stack test with Thread and mutex";
-    ST_domain.neg_lin_test ~count:1000 ~name:"Lin Stack test with Domain without mutex";
-    ST_thread.lin_test     ~count:1000 ~name:"Lin Stack test with Thread without mutex";
+    SMT_domain.lin_test    ~count:1000 ~name:"Lin.Internal Stack test with Domain and mutex";
+    SMT_thread.lin_test    ~count:1000 ~name:"Lin.Internal Stack test with Thread and mutex";
+    ST_domain.neg_lin_test ~count:1000 ~name:"Lin.Internal Stack test with Domain without mutex";
+    ST_thread.lin_test     ~count:1000 ~name:"Lin.Internal Stack test with Thread without mutex";
   ]