one STM library with sub-libraries

ocaml-multicore · Jun 21, 2022 · 6f151c9 · 6f151c9
1 parent 41ebd11
commit 6f151c9
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 20 deletions.
diff --git a/lib/STM.ml b/lib/STM.ml
@@ -1,5 +1,4 @@
-include StmSpec
-include STM_Common
+include STM_Core
 
 module STM_Seq    = STM_Seq
 module STM_Domain = STM_Domain

diff --git a/lib/dune b/lib/dune
@@ -16,6 +16,12 @@
  (modules STM_Domain)
  (libraries qcheck util STM_Core))
 
+(library
+ (name STM)
+ (public_name multicorecheck.stm)
+ (modules STM)
+ (libraries STM_Core STM_Seq STM_Domain STM_Thread))
+
 (library
  (name STM_Thread)
  (public_name multicorecheck.stm_thread)

diff --git a/src/atomic/atomic_test.ml b/src/atomic/atomic_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** This is a parallel test of the Atomic module *)
 

diff --git a/src/atomic/dune b/src/atomic/dune
@@ -12,7 +12,7 @@
 (executable
  (name atomic_test)
  (modules atomic_test)
- (libraries qcheck STM_Core STM_Seq STM_Domain STM_Thread)
+ (libraries qcheck STM)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 (rule

diff --git a/src/buffer/buffer_stm_test.ml b/src/buffer/buffer_stm_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** parallel STM tests of Buffer *)
 

diff --git a/src/buffer/dune b/src/buffer/dune
@@ -15,7 +15,7 @@
 (executable
  (name buffer_stm_test)
  (modules buffer_stm_test)
- (libraries qcheck STM_Seq STM_Domain STM_Thread)
+ (libraries qcheck STM)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 (rule

diff --git a/src/domainslib/chan_tests.ml b/src/domainslib/chan_tests.ml
@@ -1,6 +1,6 @@
 open QCheck
 open Domainslib
-open STM_Core
+open STM
 
 (** This is a parallel test of Domainslib.Chan *)
 

diff --git a/src/domainslib/dune b/src/domainslib/dune
@@ -57,7 +57,7 @@
  (name chan_tests)
  (modes native byte)
  (modules chan_tests)
- (libraries util qcheck STM_Seq STM_Domain STM_Thread domainslib)
+ (libraries util qcheck STM domainslib)
  (preprocess (pps ppx_deriving.show)))
 
 (rule

diff --git a/src/ephemeron/dune b/src/ephemeron/dune
@@ -14,7 +14,7 @@
 (executable
  (name stm_test)
  (modules stm_test)
- (libraries qcheck STM_Core STM_Seq STM_Domain STM_Thread)
+ (libraries qcheck STM)
  (preprocess (pps ppx_deriving.show)))
 
 (rule

diff --git a/src/ephemeron/stm_test.ml b/src/ephemeron/stm_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** parallel STM tests of Ephemeron *)
 

diff --git a/src/hashtbl/dune b/src/hashtbl/dune
@@ -18,7 +18,7 @@
 (executable
  (name stm_test)
  (modules stm_test)
- (libraries qcheck STM_Seq STM_Domain STM_Thread)
+ (libraries qcheck STM)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show)))
 
 ; (rule

diff --git a/src/hashtbl/stm_test.ml b/src/hashtbl/stm_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** parallel STM tests of Hashtbl *)
 

diff --git a/src/lazy/dune b/src/lazy/dune
@@ -15,7 +15,7 @@
 (executable
  (name lazy_stm_test)
  (modules lazy_stm_test)
- (libraries qcheck STM_Seq STM_Domain STM_Thread)
+ (libraries qcheck STM)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 (rule

diff --git a/src/lazy/lazy_stm_test.ml b/src/lazy/lazy_stm_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** parallel STM tests of Lazy *)
 

diff --git a/src/lockfree/dune b/src/lockfree/dune
@@ -11,7 +11,7 @@
 (executable
  (name ws_deque_test)
  (modules ws_deque_test)
- (libraries qcheck STM_Seq STM_Domain STM_Thread lockfree)
+ (libraries qcheck STM lockfree)
  (preprocess (pps ppx_deriving.show)))
 
 (env

diff --git a/src/lockfree/ws_deque_test.ml b/src/lockfree/ws_deque_test.ml
@@ -1,7 +1,7 @@
 (** Sequential tests of ws_deque *)
 
 open QCheck
-open STM_Core
+open STM
 module Ws_deque = Lockfree.Ws_deque
 
 module WSDConf =

diff --git a/src/neg_tests/conclist_test.ml b/src/neg_tests/conclist_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** This is a parallel test of the buggy concurrent list CList *)
 

diff --git a/src/neg_tests/dune b/src/neg_tests/dune
@@ -14,7 +14,7 @@
 (executable
  (name ref_test)
  (modules ref_test)
- (libraries qcheck STM_Seq STM_Domain STM_Thread)
+ (libraries qcheck STM)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 (env
@@ -38,7 +38,7 @@
 (executable
  (name conclist_test)
  (modules conclist_test)
- (libraries CList qcheck STM_Seq STM_Domain STM_Thread)
+ (libraries CList qcheck STM)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq)))
 
 (rule

diff --git a/src/neg_tests/ref_test.ml b/src/neg_tests/ref_test.ml
@@ -1,5 +1,5 @@
 open QCheck
-open STM_Core
+open STM
 
 (** This is a parallel test of refs *)