Merge pull request #197 from jmid/disable-ref-thread-tests

Disable ref thread tests in bytecode mode

Author: jmid

src/neg_tests/dune

@@ -6,81 +6,82 @@
  (package multicoretests)
  (deps
    ;; STM tests
-   ref_stm_seq_tests.exe
-   ref_stm_dom_tests.exe
-   ref_stm_thread_tests.exe
-   conclist_stm_tests.exe
+   stm_tests_sequential_ref.exe
+   stm_tests_domain_ref.exe
+   stm_tests_thread_ref.exe ;; currently disabled under bytecode mode
+   stm_tests_conclist.exe
    ;; Lin tests
-   domain_lin_tests.exe ;; currently not run on CI
-   effect_lin_tests.exe ;; currently not run on CI
-   thread_lin_tests.exe
+   lin_tests_domain.exe ;; currently not run on CI
+   lin_tests_effect.exe ;; currently not run on CI
+   lin_tests_thread_ref.exe ;; currently disabled under bytecode mode
+   lin_tests_thread_conclist.exe
    ;; Lin_api tests
-   domain_lin_tests_dsl.exe
-   effect_lin_tests_dsl.exe
-   thread_lin_tests_dsl.exe)) ;; currently not run on CI
+   lin_tests_dsl_domain.exe
+   lin_tests_dsl_effect.exe
+   lin_tests_dsl_thread.exe)) ;; currently not run on CI
 
 (library
- (name ref_stm_spec)
- (modules ref_stm_spec)
+ (name stm_tests_spec_ref)
+ (modules stm_tests_spec_ref)
  (libraries qcheck qcheck-stm.base)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 (executable
- (name ref_stm_seq_tests)
- (modules ref_stm_seq_tests)
- (libraries ref_stm_spec qcheck-stm.sequential))
+ (name stm_tests_sequential_ref)
+ (modules stm_tests_sequential_ref)
+ (libraries stm_tests_spec_ref qcheck-stm.sequential))
 
 (executable
- (name ref_stm_dom_tests)
- (modules ref_stm_dom_tests)
- (libraries ref_stm_spec qcheck-stm.domain))
+ (name stm_tests_domain_ref)
+ (modules stm_tests_domain_ref)
+ (libraries stm_tests_spec_ref qcheck-stm.domain))
 
 (executable
- (name ref_stm_thread_tests)
- (modules ref_stm_thread_tests)
- (libraries ref_stm_spec qcheck-stm.thread))
+ (name stm_tests_thread_ref)
+ (modules stm_tests_thread_ref)
+ (libraries stm_tests_spec_ref qcheck-stm.thread))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps ref_stm_seq_tests.exe)
+ (deps stm_tests_sequential_ref.exe)
  (action (run ./%{deps} --verbose)))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps ref_stm_dom_tests.exe)
+ (deps stm_tests_domain_ref.exe)
  (action (run ./%{deps} --verbose)))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps ref_stm_thread_tests.exe)
+ (deps stm_tests_thread_ref.exe)
  (action (run ./%{deps} --verbose)))
 
 (library
  (name CList)
  (modules CList))
 
 (executable
- (name conclist_stm_tests)
- (modules conclist_stm_tests)
+ (name stm_tests_conclist)
+ (modules stm_tests_conclist)
  (libraries CList qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show)))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps conclist_stm_tests.exe)
+ (deps stm_tests_conclist.exe)
  (action (run ./%{deps} --verbose)))
 
 
 ;; Linearizability tests of ref and Clist
 
 
 (library
- (name lin_tests_common_dsl)
- (modules lin_tests_common_dsl)
+ (name lin_tests_dsl_common)
+ (modules lin_tests_dsl_common)
  (libraries lin CList))
 
 (library
@@ -90,62 +91,68 @@
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq)))
 
 (executables
- (names domain_lin_tests_dsl thread_lin_tests_dsl)
- (modules domain_lin_tests_dsl thread_lin_tests_dsl)
+ (names lin_tests_dsl_domain lin_tests_dsl_thread)
+ (modules lin_tests_dsl_domain lin_tests_dsl_thread)
  (flags (:standard -w -27))
- (libraries lin_tests_common_dsl))
+ (libraries lin_tests_dsl_common))
 
 (executable
- (name effect_lin_tests_dsl)
- (modules effect_lin_tests_dsl)
+ (name lin_tests_dsl_effect)
+ (modules lin_tests_dsl_effect)
  (flags (:standard -w -27))
- (libraries lin_tests_common_dsl))
+ (libraries lin_tests_dsl_common))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps domain_lin_tests_dsl.exe)
+ (deps lin_tests_dsl_domain.exe)
  (action (run ./%{deps} --verbose)))
 
 ; (rule
 ;  (alias runtest)
 ;  (package multicoretests)
-;  (deps thread_lin_tests_dsl.exe)
+;  (deps lin_tests_dsl_thread.exe)
 ;  (action (run ./%{deps} --verbose)))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps effect_lin_tests_dsl.exe)
+ (deps lin_tests_dsl_effect.exe)
  (action (run ./%{deps} --verbose)))
 
 (executables
- (names domain_lin_tests thread_lin_tests)
- (modules domain_lin_tests thread_lin_tests)
+ (names lin_tests_domain lin_tests_thread_ref lin_tests_thread_conclist)
+ (modules lin_tests_domain lin_tests_thread_ref lin_tests_thread_conclist)
  (flags (:standard -w -27))
  (libraries lin_tests_common))
 
 (executable
- (name effect_lin_tests)
- (modules effect_lin_tests)
+ (name lin_tests_effect)
+ (modules lin_tests_effect)
  (flags (:standard -w -27))
  (libraries lin_tests_common)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 ; (rule
 ;  (alias runtest)
 ;  (package multicoretests)
-;  (deps domain_lin_tests.exe)
+;  (deps lin_tests_domain.exe)
 ;  (action (run ./%{deps} --verbose)))
 
 (rule
  (alias runtest)
  (package multicoretests)
- (deps thread_lin_tests.exe)
+ (deps lin_tests_thread_ref.exe)
+ (action (run ./%{deps} --verbose)))
+
+(rule
+ (alias runtest)
+ (package multicoretests)
+ (deps lin_tests_thread_conclist.exe)
  (action (run ./%{deps} --verbose)))
 
 ; (rule
 ;  (alias runtest)
 ;  (package multicoretests)
-;  (deps effect_lin_tests.exe)
+;  (deps lin_tests_effect.exe)
 ;  (action (run ./%{deps} --verbose)))

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

@@ -1,4 +1,4 @@
-open Lin_tests_common_dsl
+open Lin_tests_dsl_common
 
 (** This is a driver of the negative tests over the Domain module *)
 

src/neg_tests/lin_tests_common_dsl.ml renamed to src/neg_tests/lin_tests_dsl_common.ml

@@ -1,4 +1,4 @@
-open Lin_tests_common_dsl
+open Lin_tests_dsl_common
 open Lin_api
 
 (** This is a driver of the negative tests over the Effect module *)

src/neg_tests/domain_lin_tests_dsl.ml renamed to src/neg_tests/lin_tests_dsl_domain.ml

@@ -1,4 +1,4 @@
-open Lin_tests_common_dsl
+open Lin_tests_dsl_common
 
 (** This is a driver of the negative tests over the Thread module *)
 

src/neg_tests/effect_lin_tests_dsl.ml renamed to src/neg_tests/lin_tests_dsl_effect.ml

@@ -0,0 +1,9 @@
+open Lin_tests_common
+
+(** This is a driver of the negative CList tests over the Thread module *)
+
+;;
+QCheck_base_runner.run_tests_main
+  (let count = 1000 in
+   [CLT_int.lin_test      `Thread ~count ~name:"Lin CList int test with Thread"; (* unboxed, hence no allocations to trigger context switch *)
+    CLT_int64.lin_test    `Thread ~count ~name:"Lin CList int64 test with Thread"]) (* not triggering context switch, unfortunately *)

src/neg_tests/thread_lin_tests_dsl.ml renamed to src/neg_tests/lin_tests_dsl_thread.ml

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