Add (and use) a runner wrapping every test, to improve error reporting

.github/workflows/common.yml

@@ -81,6 +81,8 @@ jobs:
   build-and-test:
     env:
       QCHECK_MSG_INTERVAL:      '60'
+      TIMELOGDIR:               ${{ github.workspace }}
+      TIMEOUT:                  ${{ inputs.timeout }}
       DUNE_PROFILE:             ${{ inputs.dune_profile }}
       OCAMLRUNPARAM:            ${{ inputs.runparam }}
       ONLY_TEST:                ${{ inputs.only_test }}
@@ -118,6 +120,10 @@ jobs:
             echo "LDFLAGS=-L/usr/lib/i386-linux-gnu/" >> $GITHUB_ENV
           fi
 
+          # Compute a deadline to respect time-out
+          echo "DEADLINE=$(date -d "now + $((TIMEOUT - 3)) minutes" +%s)" >> "$GITHUB_ENV"
+          cat "$GITHUB_ENV"
+
           # Generate an OPAM config for a custom compiler
           if [ -n "$CUSTOM_COMPILER_VERSION" ]; then
             if [ -z "$CUSTOM_COMPILER_SRC" ]; then
@@ -203,6 +209,7 @@ jobs:
           echo "OPAMJOBS=1" >> $GITHUB_ENV
 
       - name: Install Multicore Tests dependencies
+        id: dependencies
         run: |
           opam install . --deps-only --with-test
 
@@ -272,3 +279,7 @@ jobs:
           }
           echo "Test failed $failures times"
         if: env.ONLY_TEST != '' && runner.os == 'Windows'
+
+      - name: Summarize test run times
+        run: opam exec -- dune build @cat-times
+        if: "success() || (failure() && steps.dependencies.conclusion == 'success')"

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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}))
 )

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"))
 )

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"))
 )

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"))
 )

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"))
 )

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}))
 )