Skip to content

Commit a5a878c

Browse files
committed
Use the custom runner for the test suite
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
1 parent 8964281 commit a5a878c

File tree

20 files changed

+62
-53
lines changed

20 files changed

+62
-53
lines changed

src/array/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)
1111

1212
(test
@@ -16,7 +16,7 @@
1616
(flags (:standard -w -27))
1717
(libraries qcheck-lin.domain)
1818
(preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
19-
; (action (run %{test} --verbose))
19+
; (action (run runner %{dep:lin_tests.exe}))
2020
(action (echo "Skipping src/array/%{test} from the test suite\n\n"))
2121
)
2222

@@ -25,5 +25,5 @@
2525
(modules lin_tests_dsl)
2626
(package multicoretests)
2727
(libraries qcheck-lin.domain)
28-
(action (run %{test} --verbose))
28+
(action (run runner %{dep:lin_tests_dsl.exe}))
2929
)

src/atomic/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(package multicoretests)
99
(libraries qcheck-stm.sequential qcheck-stm.domain)
1010
(preprocess (pps ppx_deriving.show))
11-
(action (run %{test} --verbose))
11+
(action (run runner %{dep:stm_tests.exe}))
1212
)
1313

1414
;; Linearization tests of Atomic, utilizing ppx_deriving_qcheck
@@ -20,7 +20,7 @@
2020
(flags (:standard -w -27))
2121
(libraries qcheck-lin.domain)
2222
(preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
23-
; (action (run %{test} --verbose))
23+
; (action (run runner %{dep:lin_tests.exe}))
2424
(action (echo "Skipping src/atomic/%{test} from the test suite\n\n"))
2525
)
2626

@@ -29,5 +29,5 @@
2929
(modules lin_tests_dsl)
3030
(package multicoretests)
3131
(libraries qcheck-lin.domain)
32-
(action (run %{test} --verbose))
32+
(action (run runner %{dep:lin_tests_dsl.exe}))
3333
)

src/bigarray/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
; (action (run %{test} --verbose))
9+
; (action (run runner %{dep:stm_tests.exe}))
1010
(action (echo "Skipping src/bigarray/%{test} from the test suite\n\n"))
1111
)
1212

@@ -15,5 +15,5 @@
1515
(modules lin_tests_dsl)
1616
(package multicoretests)
1717
(libraries qcheck-lin.domain)
18-
(action (run %{test} --verbose))
18+
(action (run runner %{dep:lin_tests_dsl.exe}))
1919
)

src/buffer/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)

src/bytes/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)
1111

1212
(test
1313
(name lin_tests_dsl)
1414
(modules lin_tests_dsl)
1515
(package multicoretests)
1616
(libraries qcheck-lin.domain qcheck-lin.thread)
17-
(action (run %{test} --verbose))
17+
(action (run runner %{dep:lin_tests_dsl.exe}))
1818
)

src/domain/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(package multicoretests)
99
(libraries util qcheck-core qcheck-core.runner)
1010
(preprocess (pps ppx_deriving.show))
11-
(action (run %{test} --verbose))
11+
(action (run runner %{dep:domain_joingraph.exe}))
1212
)
1313

1414
(test
@@ -17,5 +17,5 @@
1717
(package multicoretests)
1818
(libraries util qcheck-core qcheck-core.runner)
1919
(preprocess (pps ppx_deriving.show))
20-
(action (run %{test} --verbose))
20+
(action (run runner %{dep:domain_spawntree.exe}))
2121
)

src/dynlink/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
(modules lin_tests_dsl)
1616
(package multicoretests)
1717
(libraries qcheck-lin.domain dynlink libA libB)
18-
(action (run %{test} --verbose))
18+
(action (run runner %{dep:lin_tests_dsl.exe}))
1919
)

src/ephemeron/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)
1111

1212
(test
1313
(name lin_tests_dsl)
1414
(modules lin_tests_dsl)
1515
(package multicoretests)
1616
(libraries qcheck-lin.domain qcheck-lin.thread)
17-
(action (run %{test} --verbose))
17+
(action (run runner %{dep:lin_tests_dsl.exe}))
1818
)

src/floatarray/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)
1111

1212
(test
1313
(name lin_tests_dsl)
1414
(modules lin_tests_dsl)
1515
(package multicoretests)
1616
(libraries qcheck-lin.domain)
17-
(action (run %{test} --verbose))
17+
(action (run runner %{dep:lin_tests_dsl.exe}))
1818
)

src/hashtbl/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)
1111

1212
(test
@@ -16,7 +16,7 @@
1616
(flags (:standard -w -27))
1717
(libraries qcheck-lin.domain)
1818
(preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
19-
; (action (run %{test} --verbose))
19+
; (action (run runner %{dep:lin_tests.exe}))
2020
(action (echo "Skipping src/hashtbl/%{test} from the test suite\n\n"))
2121
)
2222

@@ -25,5 +25,5 @@
2525
(modules lin_tests_dsl)
2626
(package multicoretests)
2727
(libraries qcheck-lin.domain)
28-
(action (run %{test} --verbose))
28+
(action (run runner %{dep:lin_tests_dsl.exe}))
2929
)

src/io/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
;(flags (:standard -w -27))
88
(libraries qcheck-lin.domain)
9-
; (action (run %{test} --verbose))
9+
; (action (run runner %{dep:lin_tests.exe}))
1010
(action (echo "Skipping src/io/%{test} from the test suite\n\n"))
1111
)
1212

@@ -23,7 +23,7 @@
2323
(package multicoretests)
2424
;(flags (:standard -w -27))
2525
(libraries qcheck-lin.domain lin_tests_dsl_common_io)
26-
(action (run %{test} --verbose))
26+
(action (run runner %{dep:lin_tests_dsl_domain.exe}))
2727
)
2828

2929
(test
@@ -32,6 +32,6 @@
3232
(package multicoretests)
3333
;(flags (:standard -w -27))
3434
(libraries qcheck-lin.thread lin_tests_dsl_common_io)
35-
; (action (run %{test} --verbose))
35+
; (action (run runner %{dep:lin_tests_dsl_thread.exe}))
3636
(action (echo "Skipping src/io/%{test} from the test suite\n\n"))
3737
)

src/lazy/dune

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)
1111

1212
(test
@@ -15,7 +15,7 @@
1515
(package multicoretests)
1616
(libraries qcheck-lin.domain)
1717
(preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
18-
; (action (run %{test} --verbose))
18+
; (action (run runner %{dep:lin_tests.exe}))
1919
(action (echo "Skipping src/lazy/%{test} from the test suite\n\n"))
2020
)
2121

@@ -24,6 +24,6 @@
2424
(modules lin_tests_dsl)
2525
(package multicoretests)
2626
(libraries qcheck-lin.domain)
27-
; (action (run %{test} --verbose))
27+
; (action (run runner %{dep:lin_tests_dsl.exe}))
2828
(action (echo "Skipping src/lazy/%{test} from the test suite\n\n"))
2929
)

src/neg_tests/dune

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -13,23 +13,23 @@
1313
(modules stm_tests_sequential_ref)
1414
(package multicoretests)
1515
(libraries stm_tests_spec_ref qcheck-stm.sequential)
16-
(action (run %{test} --verbose))
16+
(action (run runner %{dep:stm_tests_sequential_ref.exe}))
1717
)
1818

1919
(test
2020
(name stm_tests_domain_ref)
2121
(modules stm_tests_domain_ref)
2222
(package multicoretests)
2323
(libraries stm_tests_spec_ref qcheck-stm.domain)
24-
(action (run %{test} --verbose))
24+
(action (run runner %{dep:stm_tests_domain_ref.exe}))
2525
)
2626

2727
(test
2828
(name stm_tests_thread_ref)
2929
(modules stm_tests_thread_ref)
3030
(package multicoretests)
3131
(libraries stm_tests_spec_ref qcheck-stm.thread)
32-
(action (run %{test} --verbose))
32+
(action (run runner %{dep:stm_tests_thread_ref.exe}))
3333
)
3434

3535
(library
@@ -44,7 +44,7 @@
4444
(package multicoretests)
4545
(libraries CList qcheck-stm.sequential qcheck-stm.domain)
4646
(preprocess (pps ppx_deriving.show))
47-
(action (run %{test} --verbose))
47+
(action (run runner %{dep:stm_tests_conclist.exe}))
4848
)
4949

5050
;; Linearization tests of ref and Clist with Lin
@@ -70,7 +70,7 @@
7070
(package multicoretests)
7171
(flags (:standard -w -27))
7272
(libraries lin_tests_dsl_common)
73-
(action (run %{test} --verbose))
73+
(action (run runner %{dep:lin_tests_dsl_domain.exe}))
7474
)
7575

7676
(test
@@ -79,7 +79,7 @@
7979
(package multicoretests)
8080
(flags (:standard -w -27))
8181
(libraries lin_tests_dsl_common qcheck-lin.thread)
82-
; (action (run %{test} --verbose))
82+
; (action (run runner %{dep:lin_tests_dsl_thread.exe}))
8383
(action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
8484
)
8585

@@ -89,7 +89,7 @@
8989
(package multicoretests)
9090
(flags (:standard -w -27))
9191
(libraries lin_tests_dsl_common qcheck-lin.effect)
92-
(action (run %{test} --verbose))
92+
(action (run runner %{dep:lin_tests_dsl_effect.exe}))
9393
)
9494

9595
;; Linearization tests of ref and Clist with Lin.Internal
@@ -100,17 +100,26 @@
100100
(package multicoretests)
101101
(flags (:standard -w -27))
102102
(libraries lin_tests_common)
103-
; (action (run %{test} --verbose))
103+
; (action (run runner %{dep:lin_tests_domain.exe}))
104104
(action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
105105
)
106106

107-
(tests
108-
(names lin_tests_thread_ref lin_tests_thread_conclist)
109-
(modules lin_tests_thread_ref lin_tests_thread_conclist)
107+
(test
108+
(name lin_tests_thread_ref)
109+
(modules lin_tests_thread_ref)
110+
(package multicoretests)
111+
(flags (:standard -w -27))
112+
(libraries lin_tests_common qcheck-lin.thread)
113+
(action (run runner %{dep:lin_tests_thread_ref.exe}))
114+
)
115+
116+
(test
117+
(name lin_tests_thread_conclist)
118+
(modules lin_tests_thread_conclist)
110119
(package multicoretests)
111120
(flags (:standard -w -27))
112121
(libraries lin_tests_common qcheck-lin.thread)
113-
(action (run %{test} --verbose))
122+
(action (run runner %{dep:lin_tests_thread_conclist.exe}))
114123
)
115124

116125
(test
@@ -120,6 +129,6 @@
120129
(flags (:standard -w -27))
121130
(libraries lin_tests_common qcheck-lin.effect)
122131
(preprocess (pps ppx_deriving.show ppx_deriving.eq))
123-
; (action (run ./%{deps} --verbose))
132+
; (action (run runner %{dep:lin_tests_effect.exe}))
124133
(action (echo "Skipping src/neg_tests/%{test} from the test suite\n\n"))
125134
)

src/queue/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
(flags (:standard -w -27))
88
(libraries qcheck-lin.domain qcheck-lin.thread)
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:lin_tests_dsl.exe}))
1010
)
1111

1212
(test
@@ -16,6 +16,6 @@
1616
(flags (:standard -w -27))
1717
(libraries qcheck-lin.domain qcheck-lin.thread)
1818
(preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
19-
;(action (run %{test} --verbose))
19+
;(action (run runner %{dep:lin_tests.exe}))
2020
(action (echo "Skipping src/queue/%{test} from the test suite\n\n"))
2121
)

src/semaphore/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)

src/stack/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
(package multicoretests)
77
(flags (:standard -w -27))
88
(libraries qcheck-lin.domain qcheck-lin.thread)
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:lin_tests_dsl.exe}))
1010
)
1111

1212
(test
@@ -16,7 +16,7 @@
1616
(flags (:standard -w -27))
1717
(libraries qcheck-lin.domain qcheck-lin.thread)
1818
(preprocess (pps ppx_deriving_qcheck ppx_deriving.show ppx_deriving.eq))
19-
; (action (run %{test} --verbose))
19+
; (action (run runner %{dep:lin_tests.exe}))
2020
(action (echo "Skipping src/stack/%{test} from the test suite\n\n"))
2121
)
2222

src/sys/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
(package multicoretests)
77
(libraries qcheck-stm.sequential qcheck-stm.domain)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:stm_tests.exe}))
1010
)

src/thread/dune

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
(package multicoretests)
99
(libraries threads qcheck-core util)
1010
(preprocess (pps ppx_deriving.show))
11-
(action (run %{test} --verbose))
11+
(action (run runner %{dep:thread_joingraph.exe}))
1212
)
1313

1414
(test
@@ -17,5 +17,5 @@
1717
(package multicoretests)
1818
(libraries threads qcheck-core util)
1919
(preprocess (pps ppx_deriving.show))
20-
(action (run %{test} --verbose))
20+
(action (run runner %{dep:thread_createtree.exe}))
2121
)

src/threadomain/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
(package multicoretests)
77
(libraries util qcheck-core threads)
88
(preprocess (pps ppx_deriving.show))
9-
(action (run %{test} --verbose))
9+
(action (run runner %{dep:threadomain.exe}))
1010
)

0 commit comments

Comments
 (0)