diff --git a/README.md b/README.md index 5ef98ae1d..6a04cf450 100644 --- a/README.md +++ b/README.md @@ -156,7 +156,7 @@ end module HT = Lin_domain.Make(HashtblSig) ;; QCheck_base_runner.run_tests_main [ - HT.lin_test `Domain ~count:1000 ~name:"Hashtbl DSL test"; + HT.lin_test `Domain ~count:1000 ~name:"Lin Hashtbl test"; ] ``` @@ -178,11 +178,11 @@ framework then performs a search for a sequential interleaving of the same calls, and succeeds if it finds one. Since `Hashtbl`s are not safe for parallelism, if you run -`dune exec doc/example/lin_tests_dsl.exe` the output can produce the +`dune exec doc/example/lin_tests.exe` the output can produce the following output, where each tested command is annotated with its result: ``` -Messages for test Hashtbl DSL test: +Messages for test Lin Hashtbl test: Results incompatible with sequential execution @@ -205,7 +205,7 @@ the last call should return `2`: let res2 = Hashtbl.length t;; ``` -See [src/atomic/lin_tests_dsl.ml](src/atomic/lin_tests_dsl.ml) for +See [src/atomic/lin_tests.ml](src/atomic/lin_tests.ml) for another example of testing the `Atomic` module. diff --git a/doc/example/dune b/doc/example/dune index bb069721f..5cc51cc70 100644 --- a/doc/example/dune +++ b/doc/example/dune @@ -1,8 +1,8 @@ ;; A linearization test of the stdlib Hashtbl library (executable - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (libraries qcheck-lin.domain)) diff --git a/doc/example/lin_tests_dsl.ml b/doc/example/lin_tests.ml similarity index 94% rename from doc/example/lin_tests_dsl.ml rename to doc/example/lin_tests.ml index 03a2c211f..34419dd5a 100644 --- a/doc/example/lin_tests_dsl.ml +++ b/doc/example/lin_tests.ml @@ -20,5 +20,5 @@ end module HT = Lin_domain.Make(HashtblSig) ;; QCheck_base_runner.run_tests_main [ - HT.lin_test ~count:1000 ~name:"Hashtbl DSL test"; + HT.lin_test ~count:1000 ~name:"Lin Hashtbl test"; ] diff --git a/doc/paper-examples/dune b/doc/paper-examples/dune index bb069721f..5cc51cc70 100644 --- a/doc/paper-examples/dune +++ b/doc/paper-examples/dune @@ -1,8 +1,8 @@ ;; A linearization test of the stdlib Hashtbl library (executable - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (libraries qcheck-lin.domain)) diff --git a/doc/paper-examples/lin_tests_dsl.ml b/doc/paper-examples/lin_tests.ml similarity index 95% rename from doc/paper-examples/lin_tests_dsl.ml rename to doc/paper-examples/lin_tests.ml index 94e0d235e..cee82ce82 100644 --- a/doc/paper-examples/lin_tests_dsl.ml +++ b/doc/paper-examples/lin_tests.ml @@ -24,5 +24,5 @@ end module HT = Lin_domain.Make(HashtblSig) ;; QCheck_base_runner.run_tests_main [ - HT.lin_test ~count:1000 ~name:"Hashtbl DSL test"; + HT.lin_test ~count:1000 ~name:"Lin Hashtbl test"; ] diff --git a/dune b/dune index dc8ad24b1..ceb705d72 100644 --- a/dune +++ b/dune @@ -64,7 +64,7 @@ ; To change the test to repeat, change the source of the `copy`: (rule - (copy src/io/lin_tests_dsl_domain.exe focusedtest.exe)) + (copy src/io/lin_tests_domain.exe focusedtest.exe)) (rule (alias focusedtest) diff --git a/src/README.md b/src/README.md index d75a7009b..5970f3b5c 100644 --- a/src/README.md +++ b/src/README.md @@ -18,6 +18,9 @@ Tests utilizing the parallel STM.ml capability: - [bytes/stm_tests.ml](bytes/stm_tests.ml) contains sequential and parallel tests of the `Bytes` module + - [domain/stm_tests_dls.ml](domain/stm_tests_dls.ml) contains sequential and + parallel tests of the `Domain.DLS` module + - [ephemeron/stm_tests.ml](ephemeron/stm_tests.ml) contains sequential and parallel tests of the `Ephemeron` module @@ -44,30 +47,37 @@ Tests utilizing the parallel STM.ml capability: Tests utilizing the linearization tests of Lin.ml: - - [array/lin_internal_tests.ml](array/lin_internal_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.ml](array/lin_tests.ml) contain experimental `Lin.Internal` and `Lin`-tests of `Array` - - [atomic/lin_internal_tests.ml](atomic/lin_internal_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.ml](atomic/lin_tests.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` + - [bigarray/lin_tests.ml](bigarray/lin_tests.ml) contains experimental `Lin`-tests of `Bigarray` + + - [bytes/lin_tests.ml](bytes/lin_tests.ml) contains experimental `Lin`-tests of `Bytes` - - [bytes/lin_tests_dsl.ml](bytes/lin_tests_dsl.ml) contains experimental `Lin`-tests of `Bytes` + - [domain/lin_tests_dls.ml](domain/lin_tests_dls.ml) contains experimental `Lin`-tests of `Domain.DLS` - - [dynlink/lin_tests_dsl.ml](dynlink/lin_tests_dsl.ml) contains experimental `Lin`-tests of `Dynlink` + - [dynlink/lin_tests.ml](dynlink/lin_tests.ml) contains experimental `Lin`-tests of `Dynlink` - - [floatarray/lin_tests_dsl.ml](floatarray/lin_tests_dsl.ml) contains experimental `Lin`-tests of `Float.Array` + - [floatarray/lin_tests.ml](floatarray/lin_tests.ml) contains experimental `Lin`-tests of `Float.Array` - - [hashtbl/lin_internal_tests.ml](hashtbl/lin_internal_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.ml](hashtbl/lin_tests.ml) contain experimental `Lin.Internal` and `Lin`-tests of `Hashtbl` - - [lazy/lin_internal_tests.ml](lazy/lin_internal_tests.ml) and [lazy/lin_tests_dsl.ml](lazy/lin_tests_dsl.ml) + - [io/lin_internal_tests.ml](hashtbl/lin_internal_tests.ml), + [io/lin_tests_domain.ml](io/lin_tests_domain.ml), and + [io/lin_tests_thread.ml](io/lin_tests_thread.ml) contain experimental + `Lin.Internal` and `Lin`-tests of `In_channel` and `Out_channel` + + - [lazy/lin_internal_tests.ml](lazy/lin_internal_tests.ml) and [lazy/lin_tests.ml](lazy/lin_tests.ml) contain experimental `Lin.Internal` and `Lin`-tests of `Lazy` - - [queue/lin_internal_tests.ml](queue/lin_internal_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.ml](queue/lin_tests.ml) contain experimental `Lin.Internal` and `Lin`-tests of `Queue` - - [stack/lin_internal_tests.ml](stack/lin_internal_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.ml](stack/lin_tests.ml) contain experimental `Lin.Internal` and `Lin`-tests of `Stack` @@ -97,7 +107,7 @@ check). For `Lin.Internal` and `Lin` - [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) +- [neg_tests/lin_tests_common.ml](neg_tests/lin_tests_common.ml) contain "sanity check tests" for an unprotected global `ref` and a buggy concurrent list over unboxed `int` and boxed `int64` types. diff --git a/src/array/dune b/src/array/dune index 75258c5e0..c69df6358 100644 --- a/src/array/dune +++ b/src/array/dune @@ -19,8 +19,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain) (action (run %{test} --verbose)) diff --git a/src/array/lin_tests_dsl.ml b/src/array/lin_tests.ml similarity index 95% rename from src/array/lin_tests_dsl.ml rename to src/array/lin_tests.ml index fb5b67f27..28e034fc9 100644 --- a/src/array/lin_tests_dsl.ml +++ b/src/array/lin_tests.ml @@ -29,5 +29,5 @@ end module AT_domain = Lin_domain.Make(AConf) ;; QCheck_base_runner.run_tests_main [ - AT_domain.neg_lin_test ~count:1000 ~name:"Lin DSL Array test with Domain"; + AT_domain.neg_lin_test ~count:1000 ~name:"Lin Array test with Domain"; ] diff --git a/src/atomic/dune b/src/atomic/dune index a6aa71ccb..f188c03bf 100644 --- a/src/atomic/dune +++ b/src/atomic/dune @@ -23,8 +23,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain) (action (run %{test} --verbose)) diff --git a/src/atomic/lin_tests_dsl.ml b/src/atomic/lin_tests.ml similarity index 91% rename from src/atomic/lin_tests_dsl.ml rename to src/atomic/lin_tests.ml index 88e7c2e38..9c30cda5c 100644 --- a/src/atomic/lin_tests_dsl.ml +++ b/src/atomic/lin_tests.ml @@ -17,5 +17,5 @@ module Lin_atomic_domain = Lin_domain.Make (Atomic_spec) let () = QCheck_base_runner.run_tests_main - [ Lin_atomic_domain.lin_test ~count:1000 ~name:"Lin DSL Atomic test with Domain"; + [ Lin_atomic_domain.lin_test ~count:1000 ~name:"Lin Atomic test with Domain"; ] diff --git a/src/bigarray/dune b/src/bigarray/dune index f36f81b22..fda50934b 100644 --- a/src/bigarray/dune +++ b/src/bigarray/dune @@ -10,8 +10,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain) (action (run %{test} --verbose)) diff --git a/src/bigarray/lin_tests_dsl.ml b/src/bigarray/lin_tests.ml similarity index 91% rename from src/bigarray/lin_tests_dsl.ml rename to src/bigarray/lin_tests.ml index fbd609ed9..d55b5926b 100644 --- a/src/bigarray/lin_tests_dsl.ml +++ b/src/bigarray/lin_tests.ml @@ -29,5 +29,5 @@ module BA1T = Lin_domain.Make(BA1Conf) let _ = QCheck_base_runner.run_tests_main [ - BA1T.neg_lin_test ~count:5000 ~name:"Lin DSL Bigarray.Array1 (of ints) test with Domain"; + BA1T.neg_lin_test ~count:5000 ~name:"Lin Bigarray.Array1 (of ints) test with Domain"; ] diff --git a/src/bytes/dune b/src/bytes/dune index ed04ded13..d6e68c153 100644 --- a/src/bytes/dune +++ b/src/bytes/dune @@ -9,8 +9,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain qcheck-lin.thread) (action (run %{test} --verbose)) diff --git a/src/bytes/lin_tests_dsl.ml b/src/bytes/lin_tests.ml similarity index 88% rename from src/bytes/lin_tests_dsl.ml rename to src/bytes/lin_tests.ml index 739974690..c39d72bb9 100644 --- a/src/bytes/lin_tests_dsl.ml +++ b/src/bytes/lin_tests.ml @@ -21,6 +21,6 @@ module BT_domain = Lin_domain.Make(BConf) module BT_thread = Lin_thread.Make(BConf) [@alert "-experimental"] ;; QCheck_base_runner.run_tests_main [ - BT_domain.lin_test ~count:1000 ~name:"Lin DSL Bytes test with Domain"; - BT_thread.lin_test ~count:1000 ~name:"Lin DSL Bytes test with Thread"; + BT_domain.lin_test ~count:1000 ~name:"Lin Bytes test with Domain"; + BT_thread.lin_test ~count:1000 ~name:"Lin Bytes test with Thread"; ] diff --git a/src/domain/dune b/src/domain/dune index 6461e0f07..8048842f9 100644 --- a/src/domain/dune +++ b/src/domain/dune @@ -19,8 +19,8 @@ ) (test - (name lin_tests_dsl_dls) - (modules lin_tests_dsl_dls) + (name lin_tests_dls) + (modules lin_tests_dls) (package multicoretests) (libraries qcheck-lin.domain) ; (action (run %{test} --verbose)) @@ -28,8 +28,8 @@ ) (test - (name stm_tests_dsl_dls) - (modules stm_tests_dsl_dls) + (name stm_tests_dls) + (modules stm_tests_dls) (package multicoretests) (libraries qcheck-stm.sequential qcheck-stm.domain) (action (run %{test} --verbose)) diff --git a/src/domain/lin_tests_dsl_dls.ml b/src/domain/lin_tests_dls.ml similarity index 77% rename from src/domain/lin_tests_dsl_dls.ml rename to src/domain/lin_tests_dls.ml index 97d4b68f3..bcb85cb00 100644 --- a/src/domain/lin_tests_dsl_dls.ml +++ b/src/domain/lin_tests_dls.ml @@ -22,13 +22,13 @@ module DLST = Lin_domain.Make (struct (* let _ = Domain.join (Domain.spawn (fun () -> QCheck_base_runner.run_tests ~verbose:true - [DLSN.neg_lin_test ~count:100 ~name:"Lin DSL Domain.DLS negative test with Domain"])) + [DLSN.neg_lin_test ~count:100 ~name:"Lin Domain.DLS negative test with Domain"])) let _ = Domain.join (Domain.spawn (fun () -> QCheck_base_runner.run_tests ~verbose:true - [DLST.lin_test ~count:75 ~name:"Lin DSL Domain.DLS test with Domain"])) + [DLST.lin_test ~count:75 ~name:"Lin Domain.DLS test with Domain"])) *) QCheck_base_runner.run_tests_main [ - DLSN.neg_lin_test ~count:100 ~name:"Lin DSL Domain.DLS negative test with Domain"; - DLST.lin_test ~count:75 ~name:"Lin DSL Domain.DLS test with Domain"; + DLSN.neg_lin_test ~count:100 ~name:"Lin Domain.DLS negative test with Domain"; + DLST.lin_test ~count:75 ~name:"Lin Domain.DLS test with Domain"; ] diff --git a/src/domain/stm_tests_dsl_dls.ml b/src/domain/stm_tests_dls.ml similarity index 100% rename from src/domain/stm_tests_dsl_dls.ml rename to src/domain/stm_tests_dls.ml diff --git a/src/dynlink/dune b/src/dynlink/dune index 34cb1679a..3714cef2a 100644 --- a/src/dynlink/dune +++ b/src/dynlink/dune @@ -11,8 +11,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain dynlink libA libB) (action (run %{test} --verbose)) diff --git a/src/dynlink/lin_tests_dsl.ml b/src/dynlink/lin_tests.ml similarity index 86% rename from src/dynlink/lin_tests_dsl.ml rename to src/dynlink/lin_tests.ml index 665d00de8..89ca2f59c 100644 --- a/src/dynlink/lin_tests_dsl.ml +++ b/src/dynlink/lin_tests.ml @@ -32,8 +32,8 @@ module DynT = Lin_domain.Make(DynConf) let _ = if Sys.win32 then - Printf.printf "negative Lin DSL Dynlink test with Domain disabled under Windows\n\n%!" + Printf.printf "negative Lin Dynlink test with Domain disabled under Windows\n\n%!" else QCheck_base_runner.run_tests_main [ - DynT.neg_lin_test ~count:100 ~name:"negative Lin DSL Dynlink test with Domain"; + DynT.neg_lin_test ~count:100 ~name:"negative Lin Dynlink test with Domain"; ] diff --git a/src/floatarray/dune b/src/floatarray/dune index 6a1f1b9da..6270969e6 100644 --- a/src/floatarray/dune +++ b/src/floatarray/dune @@ -9,8 +9,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain) (action (run %{test} --verbose)) diff --git a/src/floatarray/lin_tests_dsl.ml b/src/floatarray/lin_tests.ml similarity index 96% rename from src/floatarray/lin_tests_dsl.ml rename to src/floatarray/lin_tests.ml index dfa82991d..9ee939824 100644 --- a/src/floatarray/lin_tests_dsl.ml +++ b/src/floatarray/lin_tests.ml @@ -37,5 +37,5 @@ module FAT = Lin_domain.Make(FAConf) let _ = QCheck_base_runner.run_tests_main [ - FAT.neg_lin_test ~count:1000 ~name:"Lin DSL Float.Array test with Domain"; + FAT.neg_lin_test ~count:1000 ~name:"Lin Float.Array test with Domain"; ] diff --git a/src/hashtbl/dune b/src/hashtbl/dune index 1f84f2659..4ff1afa75 100644 --- a/src/hashtbl/dune +++ b/src/hashtbl/dune @@ -19,8 +19,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain) (action (run %{test} --verbose)) diff --git a/src/hashtbl/lin_tests_dsl.ml b/src/hashtbl/lin_tests.ml similarity index 94% rename from src/hashtbl/lin_tests_dsl.ml rename to src/hashtbl/lin_tests.ml index 76b7b70a2..bc58020a0 100644 --- a/src/hashtbl/lin_tests_dsl.ml +++ b/src/hashtbl/lin_tests.ml @@ -26,5 +26,5 @@ end module HT_domain = Lin_domain.Make(HConf) ;; QCheck_base_runner.run_tests_main [ - HT_domain.neg_lin_test ~count:1000 ~name:"Lin DSL Hashtbl test with Domain"; + HT_domain.neg_lin_test ~count:1000 ~name:"Lin Hashtbl test with Domain"; ] diff --git a/src/io/dune b/src/io/dune index fbda507a6..76cf14c4f 100644 --- a/src/io/dune +++ b/src/io/dune @@ -18,8 +18,8 @@ ) (test - (name lin_tests_dsl_domain) - (modules lin_tests_dsl_domain) + (name lin_tests_domain) + (modules lin_tests_domain) (package multicoretests) ;(flags (:standard -w -27)) (libraries qcheck-lin.domain lin_tests_spec_io) @@ -29,8 +29,8 @@ ) (test - (name lin_tests_dsl_thread) - (modules lin_tests_dsl_thread) + (name lin_tests_thread) + (modules lin_tests_thread) (package multicoretests) ;(flags (:standard -w -27)) (libraries qcheck-lin.thread lin_tests_spec_io) diff --git a/src/io/lin_internal_tests.ml b/src/io/lin_internal_tests.ml index 733662e82..09a3262ec 100644 --- a/src/io/lin_internal_tests.ml +++ b/src/io/lin_internal_tests.ml @@ -121,7 +121,7 @@ module Out_channel_ops = struct let equal_res = (=) let init () = - let p,ch = Filename.open_temp_file "lin-dsl-" "" in + let p,ch = Filename.open_temp_file "lin-internal-" "" in path := p; ch diff --git a/src/io/lin_tests_dsl_domain.ml b/src/io/lin_tests_domain.ml similarity index 66% rename from src/io/lin_tests_dsl_domain.ml rename to src/io/lin_tests_domain.ml index 6837cdb51..d4c372b44 100644 --- a/src/io/lin_tests_dsl_domain.ml +++ b/src/io/lin_tests_domain.ml @@ -6,13 +6,13 @@ module IC_domain = Lin_domain.Make(Lin_tests_spec_io.ICConf) module OC_domain = Lin_domain.Make(Lin_tests_spec_io.OCConf) let tests = - IC_domain.neg_lin_test ~count:1000 ~name:"Lin DSL In_channel test with Domain" :: + IC_domain.neg_lin_test ~count:1000 ~name:"Lin In_channel test with Domain" :: if Sys.getenv_opt "OCAML_SYSTEM" = Some "macosx" then ( - Printf.printf "Lin DSL Out_channel test with Domain disabled under macOS\n\n%!"; + Printf.printf "Lin Out_channel test with Domain disabled under macOS\n\n%!"; [] ) else [ - OC_domain.neg_lin_test ~count:5000 ~name:"Lin DSL Out_channel test with Domain"; + OC_domain.neg_lin_test ~count:5000 ~name:"Lin Out_channel test with Domain"; ] let _ = QCheck_base_runner.run_tests_main tests diff --git a/src/io/lin_tests_spec_io.ml b/src/io/lin_tests_spec_io.ml index 5c4999b47..c611aad36 100644 --- a/src/io/lin_tests_spec_io.ml +++ b/src/io/lin_tests_spec_io.ml @@ -69,7 +69,7 @@ module OCConf : Lin.Spec = struct let path = ref "" let init () = - let p,ch = Filename.open_temp_file "lin-dsl-" "" in + let p,ch = Filename.open_temp_file "lin-" "" in path := p; ch diff --git a/src/io/lin_tests_dsl_thread.ml b/src/io/lin_tests_thread.ml similarity index 73% rename from src/io/lin_tests_dsl_thread.ml rename to src/io/lin_tests_thread.ml index 4ecffb307..729b98511 100644 --- a/src/io/lin_tests_dsl_thread.ml +++ b/src/io/lin_tests_thread.ml @@ -7,6 +7,6 @@ module OC_thread = Lin_thread.Make(Lin_tests_spec_io.OCConf) [@@alert "-experime let _ = QCheck_base_runner.run_tests_main [ - IC_thread.neg_lin_test ~count:1000 ~name:"Lin DSL In_channel test with Thread"; - OC_thread.neg_lin_test ~count:1000 ~name:"Lin DSL Out_channel test with Thread"; + IC_thread.neg_lin_test ~count:1000 ~name:"Lin In_channel test with Thread"; + OC_thread.neg_lin_test ~count:1000 ~name:"Lin Out_channel test with Thread"; ] diff --git a/src/lazy/dune b/src/lazy/dune index f212751a5..a6e4c4a3f 100644 --- a/src/lazy/dune +++ b/src/lazy/dune @@ -18,8 +18,8 @@ ) (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (libraries qcheck-lin.domain) ; (action (run %{test} --verbose)) diff --git a/src/lazy/lin_tests_dsl.ml b/src/lazy/lin_tests.ml similarity index 89% rename from src/lazy/lin_tests_dsl.ml rename to src/lazy/lin_tests.ml index 2e1b7d9f7..10991eda1 100644 --- a/src/lazy/lin_tests_dsl.ml +++ b/src/lazy/lin_tests.ml @@ -67,7 +67,7 @@ module LTfromfun_domain = Lin_domain.Make(LTfromfunAPI) ;; QCheck_base_runner.run_tests_main (let count = 100 in - [LTlazy_domain.neg_lin_test ~count ~name:"Lin DSL Lazy test with Domain"; - LTfromval_domain.lin_test ~count ~name:"Lin DSL Lazy test with Domain from_val"; - LTfromfun_domain.neg_lin_test ~count ~name:"Lin DSL Lazy test with Domain from_fun"; + [LTlazy_domain.neg_lin_test ~count ~name:"Lin Lazy test with Domain"; + LTfromval_domain.lin_test ~count ~name:"Lin Lazy test with Domain from_val"; + LTfromfun_domain.neg_lin_test ~count ~name:"Lin Lazy test with Domain from_fun"; ]) diff --git a/src/neg_tests/dune b/src/neg_tests/dune index 0cb0a06fe..dc7ca44a2 100644 --- a/src/neg_tests/dune +++ b/src/neg_tests/dune @@ -56,8 +56,8 @@ ;; Linearization tests of ref and Clist with Lin (library - (name lin_tests_dsl_common) - (modules lin_tests_dsl_common) + (name lin_tests_common) + (modules lin_tests_common) (package multicoretests) (libraries CList qcheck-lin.lin) ) @@ -70,30 +70,30 @@ ) (test - (name lin_tests_dsl_domain) - (modules lin_tests_dsl_domain) + (name lin_tests_domain) + (modules lin_tests_domain) (package multicoretests) (flags (:standard -w -27)) - (libraries lin_tests_dsl_common qcheck-lin.domain) + (libraries lin_tests_common qcheck-lin.domain) (action (run %{test} --verbose)) ) (test - (name lin_tests_dsl_thread) - (modules lin_tests_dsl_thread) + (name lin_tests_thread) + (modules lin_tests_thread) (package multicoretests) (flags (:standard -w -27)) - (libraries lin_tests_dsl_common qcheck-lin.thread) + (libraries lin_tests_common qcheck-lin.thread) ; (action (run %{test} --verbose)) (action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n")) ) (test - (name lin_tests_dsl_effect) - (modules lin_tests_dsl_effect) + (name lin_tests_effect) + (modules lin_tests_effect) (package multicoretests) (flags (:standard -w -27)) - (libraries lin_tests_dsl_common qcheck-lin.effect) + (libraries lin_tests_common qcheck-lin.effect) (action (run %{test} --verbose)) ) diff --git a/src/neg_tests/lin_tests_dsl_common.ml b/src/neg_tests/lin_tests_common.ml similarity index 100% rename from src/neg_tests/lin_tests_dsl_common.ml rename to src/neg_tests/lin_tests_common.ml diff --git a/src/neg_tests/lin_tests_domain.ml b/src/neg_tests/lin_tests_domain.ml new file mode 100644 index 000000000..af3e93a0f --- /dev/null +++ b/src/neg_tests/lin_tests_domain.ml @@ -0,0 +1,16 @@ +open Lin_tests_common + +module RT_int_domain = Lin_domain.Make(Ref_int_spec) +module RT_int64_domain = Lin_domain.Make(Ref_int64_spec) +module CLT_int_domain = Lin_domain.Make(CList_spec_int) +module CLT_int64_domain = Lin_domain.Make(CList_spec_int64) + +(** This is a driver of the negative tests over the Domain module *) + +;; +QCheck_base_runner.run_tests_main + (let count = 10000 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"]) diff --git a/src/neg_tests/lin_tests_dsl_domain.ml b/src/neg_tests/lin_tests_dsl_domain.ml deleted file mode 100644 index f2ffeeba0..000000000 --- a/src/neg_tests/lin_tests_dsl_domain.ml +++ /dev/null @@ -1,16 +0,0 @@ -open Lin_tests_dsl_common - -module RT_int_domain = Lin_domain.Make(Ref_int_spec) -module RT_int64_domain = Lin_domain.Make(Ref_int64_spec) -module CLT_int_domain = Lin_domain.Make(CList_spec_int) -module CLT_int64_domain = Lin_domain.Make(CList_spec_int64) - -(** This is a driver of the negative tests over the Domain module *) - -;; -QCheck_base_runner.run_tests_main - (let count = 10000 in - [RT_int_domain.neg_lin_test ~count ~name:"Lin DSL ref int test with Domain"; - RT_int64_domain.neg_lin_test ~count ~name:"Lin DSL ref int64 test with Domain"; - CLT_int_domain.neg_lin_test ~count ~name:"Lin DSL CList int test with Domain"; - CLT_int64_domain.neg_lin_test ~count ~name:"Lin DSL CList int64 test with Domain"]) diff --git a/src/neg_tests/lin_tests_dsl_effect.ml b/src/neg_tests/lin_tests_effect.ml similarity index 88% rename from src/neg_tests/lin_tests_dsl_effect.ml rename to src/neg_tests/lin_tests_effect.ml index 91f00b730..73d7dfb3b 100644 --- a/src/neg_tests/lin_tests_dsl_effect.ml +++ b/src/neg_tests/lin_tests_effect.ml @@ -1,4 +1,4 @@ -open Lin_tests_dsl_common +open Lin_tests_common open Lin (** This is a driver of the negative tests over the Effect module *) @@ -83,13 +83,13 @@ module CLT_int64'_effect = Lin_effect.Make(CList_spec_int64') [@alert "-experime 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 DSL ref int test with Effect"; - RT_int64_effect.lin_test ~count ~name:"Lin DSL ref int64 test with Effect"; - CLT_int_effect.lin_test ~count ~name:"Lin DSL CList int test with Effect"; - CLT_int64_effect.lin_test ~count ~name:"Lin DSL CList int64 test with Effect"; + 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"; (* These next four tests are negative - and are expected to fail with exception `Unhandled` *) - RT_int'_effect.neg_lin_test ~count ~name:"negative Lin DSL ref int test with Effect"; - RT_int64'_effect.neg_lin_test ~count ~name:"negative Lin DSL ref int64 test with Effect"; - CLT_int'_effect.neg_lin_test ~count ~name:"negative Lin DSL CList int test with Effect"; - CLT_int64'_effect.neg_lin_test ~count ~name:"negative Lin DSL CList int64 test with Effect" + 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" ]) diff --git a/src/neg_tests/lin_tests_dsl_thread.ml b/src/neg_tests/lin_tests_thread.ml similarity index 97% rename from src/neg_tests/lin_tests_dsl_thread.ml rename to src/neg_tests/lin_tests_thread.ml index ca9863115..02e4eab52 100644 --- a/src/neg_tests/lin_tests_dsl_thread.ml +++ b/src/neg_tests/lin_tests_thread.ml @@ -1,4 +1,4 @@ -open Lin_tests_dsl_common +open Lin_tests_common (** This is a driver of the negative tests over the Thread module *) diff --git a/src/queue/dune b/src/queue/dune index cf70de11e..afa32384a 100644 --- a/src/queue/dune +++ b/src/queue/dune @@ -1,8 +1,8 @@ ;; Linearization tests of the stdlib Queue library (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (flags (:standard -w -27)) (libraries qcheck-lin.domain qcheck-lin.thread) diff --git a/src/queue/lin_tests_dsl.ml b/src/queue/lin_tests.ml similarity index 85% rename from src/queue/lin_tests_dsl.ml rename to src/queue/lin_tests.ml index 930d75aea..26e356aa3 100644 --- a/src/queue/lin_tests_dsl.ml +++ b/src/queue/lin_tests.ml @@ -22,6 +22,6 @@ module Lin_queue_thread = Lin_thread.Make(Queue_spec) [@alert "-experimental"] let () = QCheck_base_runner.run_tests_main [ - Lin_queue_domain.neg_lin_test ~count:1000 ~name:"Lin DSL Queue test with Domain"; - Lin_queue_thread.lin_test ~count:250 ~name:"Lin DSL Queue test with Thread"; + Lin_queue_domain.neg_lin_test ~count:1000 ~name:"Lin Queue test with Domain"; + Lin_queue_thread.lin_test ~count:250 ~name:"Lin Queue test with Thread"; ] diff --git a/src/stack/dune b/src/stack/dune index 3faa70858..bcfcfef40 100644 --- a/src/stack/dune +++ b/src/stack/dune @@ -1,8 +1,8 @@ ;; Linearization tests of the stdlib Stack module (test - (name lin_tests_dsl) - (modules lin_tests_dsl) + (name lin_tests) + (modules lin_tests) (package multicoretests) (flags (:standard -w -27)) (libraries qcheck-lin.domain qcheck-lin.thread) diff --git a/src/stack/lin_tests_dsl.ml b/src/stack/lin_tests.ml similarity index 82% rename from src/stack/lin_tests_dsl.ml rename to src/stack/lin_tests.ml index 8a5dce90d..a9d4cefe7 100644 --- a/src/stack/lin_tests_dsl.ml +++ b/src/stack/lin_tests.ml @@ -22,12 +22,12 @@ module Stack_thread = Lin_thread.Make(Stack_spec) [@alert "-experimental"] let () = let tests = [ - Stack_domain.neg_lin_test ~count:1000 ~name:"Lin DSL Stack test with Domain"; - Stack_thread.lin_test ~count:250 ~name:"Lin DSL Stack test with Thread"; + Stack_domain.neg_lin_test ~count:1000 ~name:"Lin Stack test with Domain"; + Stack_thread.lin_test ~count:250 ~name:"Lin Stack test with Thread"; ] in let tests = if Sys.backend_type = Sys.Bytecode then ( - Printf.printf "Lin DSL Stack test with Thread disabled under bytecode\n\n%!"; + Printf.printf "Lin Stack test with Thread disabled under bytecode\n\n%!"; [ List.hd tests ]) else tests in