Skip to content

Commit

Permalink
Drop the v=0 parameter in CI debug runs
Browse files Browse the repository at this point in the history
To avoid getting a different output in internal expect tests (due to the
`debug mode` message), force `v=0` into `OCAMLRUNPARAM` (and default its
value to `b,v=0`)
  • Loading branch information
shym committed Sep 11, 2024
1 parent 6662af3 commit cd5b374
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/linux-500-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
with:
compiler_ref: refs/tags/5.0.0
dune_profile: 'debug-runtime'
runparam: 's=4096,v=0,V=1'
runparam: 's=4096,V=1'
timeout: 240
2 changes: 1 addition & 1 deletion .github/workflows/linux-51x-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ jobs:
with:
compiler_ref: refs/tags/5.1.1
dune_profile: 'debug-runtime'
runparam: 's=4096,v=0,V=1'
runparam: 's=4096,V=1'
timeout: 240
2 changes: 1 addition & 1 deletion .github/workflows/linux-520-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
with:
compiler_ref: refs/tags/5.2.0
dune_profile: 'debug-runtime'
runparam: 's=4096,v=0,V=1'
runparam: 's=4096,V=1'
timeout: 240
2 changes: 1 addition & 1 deletion .github/workflows/linux-530-trunk-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
with:
compiler_ref: refs/heads/5.3
dune_profile: 'debug-runtime'
runparam: 's=4096,v=0,V=1'
runparam: 's=4096,V=1'
timeout: 240
2 changes: 1 addition & 1 deletion .github/workflows/linux-540-trunk-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
with:
compiler_ref: refs/heads/trunk
dune_profile: 'debug-runtime'
runparam: 's=4096,v=0,V=1'
runparam: 's=4096,V=1'
timeout: 240
24 changes: 15 additions & 9 deletions test/dune
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,19 @@
(package qcheck-multicoretests-util)
(libraries qcheck-multicoretests-util)
(action
(setenv MCTUTILS_TRUNCATE ""
(run %{dep:util_pp.exe}))))
(setenv OCAMLRUNPARAM "%{env:OCAMLRUNPARAM=b},v=0"
(setenv MCTUTILS_TRUNCATE ""
(run %{dep:util_pp.exe})))))

(rule
(alias runtest)
(package qcheck-multicoretests-util)
(action
(progn
(with-outputs-to util_pp_trunc150.output
(setenv MCTUTILS_TRUNCATE 150
(run %{dep:util_pp.exe})))
(setenv OCAMLRUNPARAM "%{env:OCAMLRUNPARAM=b},v=0"
(setenv MCTUTILS_TRUNCATE 150
(run %{dep:util_pp.exe}))))
(diff? util_pp_trunc150.expected util_pp_trunc150.output))))

(rule
Expand All @@ -31,8 +33,9 @@
(action
(progn
(with-outputs-to util_pp_trunc79.output
(setenv MCTUTILS_TRUNCATE 79
(run %{dep:util_pp.exe})))
(setenv OCAMLRUNPARAM "%{env:OCAMLRUNPARAM=b},v=0"
(setenv MCTUTILS_TRUNCATE 79
(run %{dep:util_pp.exe}))))
(diff? util_pp_trunc79.expected util_pp_trunc79.output))))

(rule
Expand All @@ -41,8 +44,9 @@
(action
(progn
(with-outputs-to util_pp_trunc5.output
(setenv MCTUTILS_TRUNCATE 5
(run %{dep:util_pp.exe})))
(setenv OCAMLRUNPARAM "%{env:OCAMLRUNPARAM=b},v=0"
(setenv MCTUTILS_TRUNCATE 5
(run %{dep:util_pp.exe}))))
(diff? util_pp_trunc5.expected util_pp_trunc5.output))))

(executable
Expand Down Expand Up @@ -91,7 +95,9 @@
(package qcheck-stm)
(libraries qcheck-stm.sequential threads.posix)
(action
(with-accepted-exit-codes 1 (run ./%{test} --seed 229109553))))
(with-accepted-exit-codes 1
(setenv OCAMLRUNPARAM "%{env:OCAMLRUNPARAM=b},v=0"
(run ./%{test} --seed 229109553)))))

(test
(name stm_next_state_exc)
Expand Down

0 comments on commit cd5b374

Please sign in to comment.