Use the custom runner for the test suite

shym · shym · commit a5a878ce5931 · 2023-02-28T14:23:09.000+01:00
Unfortunately, syntax such as `%{dep:%{test}}` is not understood in an
action, and simply using: `(action (run runner %{test}))` does not add
the test executable to the dependencies of the action, so dune does not
build it

We keep the standard runner for the _internal_ tests, as the custom
runner would bring no benefit there
diff --git a/src/array/dune b/src/array/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 (test
@@ -16,7 +16,7 @@
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/array/%{test} from the test suite\n\n"))
 )
 
@@ -25,5 +25,5 @@
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/atomic/dune b/src/atomic/dune
@@ -8,7 +8,7 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 ;; Linearization tests of Atomic, utilizing ppx_deriving_qcheck
@@ -20,7 +20,7 @@
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/atomic/%{test} from the test suite\n\n"))
 )
 
@@ -29,5 +29,5 @@
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/bigarray/dune b/src/bigarray/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:stm_tests.exe}))
  (action (echo "Skipping src/bigarray/%{test} from the test suite\n\n"))
 )
 
@@ -15,5 +15,5 @@
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/buffer/dune b/src/buffer/dune
@@ -6,5 +6,5 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
diff --git a/src/bytes/dune b/src/bytes/dune
@@ -6,13 +6,13 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 (test
  (name lin_tests_dsl)
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain qcheck-lin.thread)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/domain/dune b/src/domain/dune
@@ -8,7 +8,7 @@
  (package multicoretests)
  (libraries util qcheck-core qcheck-core.runner)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:domain_joingraph.exe}))
 )
 
 (test
@@ -17,5 +17,5 @@
  (package multicoretests)
  (libraries util qcheck-core qcheck-core.runner)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:domain_spawntree.exe}))
 )
diff --git a/src/dynlink/dune b/src/dynlink/dune
@@ -15,5 +15,5 @@
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain dynlink libA libB)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/ephemeron/dune b/src/ephemeron/dune
@@ -6,13 +6,13 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 (test
  (name lin_tests_dsl)
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain qcheck-lin.thread)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/floatarray/dune b/src/floatarray/dune
@@ -6,13 +6,13 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 (test
  (name lin_tests_dsl)
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/hashtbl/dune b/src/hashtbl/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 (test
@@ -16,7 +16,7 @@
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/hashtbl/%{test} from the test suite\n\n"))
 )
 
@@ -25,5 +25,5 @@
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
diff --git a/src/io/dune b/src/io/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  ;(flags (:standard -w -27))
  (libraries qcheck-lin.domain)
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/io/%{test} from the test suite\n\n"))
 )
 
@@ -23,7 +23,7 @@
  (package multicoretests)
  ;(flags (:standard -w -27))
  (libraries qcheck-lin.domain lin_tests_dsl_common_io)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl_domain.exe}))
 )
 
 (test
@@ -32,6 +32,6 @@
  (package multicoretests)
  ;(flags (:standard -w -27))
  (libraries qcheck-lin.thread lin_tests_dsl_common_io)
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests_dsl_thread.exe}))
  (action (echo "Skipping src/io/%{test} from the test suite\n\n"))
 )
diff --git a/src/lazy/dune b/src/lazy/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
 
 (test
@@ -15,7 +15,7 @@
  (package multicoretests)
  (libraries qcheck-lin.domain)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/lazy/%{test} from the test suite\n\n"))
 )
 
@@ -24,6 +24,6 @@
  (modules lin_tests_dsl)
  (package multicoretests)
  (libraries qcheck-lin.domain)
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests_dsl.exe}))
  (action (echo "Skipping src/lazy/%{test} from the test suite\n\n"))
 )
diff --git a/src/neg_tests/dune b/src/neg_tests/dune
@@ -13,23 +13,23 @@
  (modules stm_tests_sequential_ref)
  (package multicoretests)
  (libraries stm_tests_spec_ref qcheck-stm.sequential)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests_sequential_ref.exe}))
 )
 
 (test
  (name stm_tests_domain_ref)
  (modules stm_tests_domain_ref)
  (package multicoretests)
  (libraries stm_tests_spec_ref qcheck-stm.domain)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests_domain_ref.exe}))
 )
 
 (test
  (name stm_tests_thread_ref)
  (modules stm_tests_thread_ref)
  (package multicoretests)
  (libraries stm_tests_spec_ref qcheck-stm.thread)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests_thread_ref.exe}))
 )
 
 (library
@@ -44,7 +44,7 @@
  (package multicoretests)
  (libraries CList qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests_conclist.exe}))
 )
 
 ;; Linearization tests of ref and Clist with Lin
@@ -70,7 +70,7 @@
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries lin_tests_dsl_common)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl_domain.exe}))
 )
 
 (test
@@ -79,7 +79,7 @@
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries lin_tests_dsl_common qcheck-lin.thread)
- ; (action (run %{test} --verbose))
+ ; (action (run runner %{dep:lin_tests_dsl_thread.exe}))
  (action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
 )
 
@@ -89,7 +89,7 @@
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries lin_tests_dsl_common qcheck-lin.effect)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl_effect.exe}))
 )
 
 ;; Linearization tests of ref and Clist with Lin.Internal
@@ -100,17 +100,26 @@
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries lin_tests_common)
-  ; (action (run %{test} --verbose))
+  ; (action (run runner %{dep:lin_tests_domain.exe}))
  (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)
+(test
+ (name lin_tests_thread_ref)
+ (modules lin_tests_thread_ref)
+ (package multicoretests)
+ (flags (:standard -w -27))
+ (libraries lin_tests_common qcheck-lin.thread)
+ (action (run runner %{dep:lin_tests_thread_ref.exe}))
+)
+
+(test
+ (name lin_tests_thread_conclist)
+ (modules lin_tests_thread_conclist)
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries lin_tests_common qcheck-lin.thread)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_thread_conclist.exe}))
 )
 
 (test
@@ -120,6 +129,6 @@
  (flags (:standard -w -27))
  (libraries lin_tests_common qcheck-lin.effect)
  (preprocess (pps ppx_deriving.show ppx_deriving.eq))
-  ; (action (run ./%{deps} --verbose))
+  ; (action (run runner %{dep:lin_tests_effect.exe}))
  (action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
 )
diff --git a/src/queue/dune b/src/queue/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain qcheck-lin.thread)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
 
 (test
@@ -16,6 +16,6 @@
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain qcheck-lin.thread)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
- ;(action (run %{test} --verbose))
+ ;(action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/queue/%{test} from the test suite\n\n"))
 )
diff --git a/src/semaphore/dune b/src/semaphore/dune
@@ -6,5 +6,5 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
diff --git a/src/stack/dune b/src/stack/dune
@@ -6,7 +6,7 @@
  (package multicoretests)
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain qcheck-lin.thread)
- (action (run %{test} --verbose))
+ (action (run runner %{dep:lin_tests_dsl.exe}))
 )
 
 (test
@@ -16,7 +16,7 @@
  (flags (:standard -w -27))
  (libraries qcheck-lin.domain qcheck-lin.thread)
  (preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
-  ; (action (run %{test} --verbose))
+  ; (action (run runner %{dep:lin_tests.exe}))
  (action (echo "Skipping src/stack/%{test} from the test suite\n\n"))
 )
 
diff --git a/src/sys/dune b/src/sys/dune
@@ -6,5 +6,5 @@
  (package multicoretests)
  (libraries qcheck-stm.sequential qcheck-stm.domain)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:stm_tests.exe}))
 )
diff --git a/src/thread/dune b/src/thread/dune
@@ -8,7 +8,7 @@
  (package multicoretests)
  (libraries threads qcheck-core util)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:thread_joingraph.exe}))
 )
 
 (test
@@ -17,5 +17,5 @@
  (package multicoretests)
  (libraries threads qcheck-core util)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:thread_createtree.exe}))
 )
diff --git a/src/threadomain/dune b/src/threadomain/dune
@@ -6,5 +6,5 @@
  (package multicoretests)
  (libraries util qcheck-core threads)
  (preprocess (pps ppx_deriving.show))
- (action (run %{test} --verbose))
+ (action (run runner %{dep:threadomain.exe}))
 )
diff --git a/src/weak/dune b/src/weak/dune

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`(package multicoretests)`
`7`	`7`	`(libraries qcheck-stm.sequential qcheck-stm.domain)`
`8`	`8`	`(preprocess (pps ppx_deriving.show))`
`9`		`- ; (action (run %{test} --verbose))`
	`9`	`+ ; (action (run runner %{dep:stm_tests.exe}))`
`10`	`10`	`(action (echo "Skipping src/bigarray/%{test} from the test suite\n\n"))`
`11`	`11`	`)`
`12`	`12`
`@@ -15,5 +15,5 @@`
`15`	`15`	`(modules lin_tests_dsl)`
`16`	`16`	`(package multicoretests)`
`17`	`17`	`(libraries qcheck-lin.domain)`
`18`		`- (action (run %{test} --verbose))`
	`18`	`+ (action (run runner %{dep:lin_tests_dsl.exe}))`
`19`	`19`	`)`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`(package multicoretests)`
`7`	`7`	`(libraries qcheck-stm.sequential qcheck-stm.domain)`
`8`	`8`	`(preprocess (pps ppx_deriving.show))`
`9`		`- (action (run %{test} --verbose))`
	`9`	`+ (action (run runner %{dep:stm_tests.exe}))`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`(package multicoretests)`
`9`	`9`	`(libraries util qcheck-core qcheck-core.runner)`
`10`	`10`	`(preprocess (pps ppx_deriving.show))`
`11`		`- (action (run %{test} --verbose))`
	`11`	`+ (action (run runner %{dep:domain_joingraph.exe}))`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`(test`
`@@ -17,5 +17,5 @@`
`17`	`17`	`(package multicoretests)`
`18`	`18`	`(libraries util qcheck-core qcheck-core.runner)`
`19`	`19`	`(preprocess (pps ppx_deriving.show))`
`20`		`- (action (run %{test} --verbose))`
	`20`	`+ (action (run runner %{dep:domain_spawntree.exe}))`
`21`	`21`	`)`