Skip to content

Commit 4ad6543

Browse files
authored
Merge pull request #478 from shym/new-aliases
Small cleanups to ease upstreaming
2 parents 5b33b02 + cd5b374 commit 4ad6543

File tree

18 files changed

+50
-32
lines changed

18 files changed

+50
-32
lines changed

.github/runner.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ case "$1" in
203203
;;
204204
internaltests)
205205
cd "$MULTICORETESTSDIR"
206-
dune runtest -j1 --no-buffer --display=quiet --cache=disabled --error-reporting=twice test/
206+
dune build @internaltests -j1 --no-buffer --display=quiet --cache=disabled --error-reporting=twice
207207
;;
208208
*)
209209
fatal "Unknown command '$1'"

.github/workflows/common.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ on:
3636
dune_alias:
3737
description: 'dune alias that should be built in the main step'
3838
type: string
39-
default: 'runtest'
39+
default: 'testsuite'
4040
compiler_repository:
4141
description: 'Repository from which to fetch the compiler'
4242
type: string

.github/workflows/linux-500-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ jobs:
1212
with:
1313
compiler_ref: refs/tags/5.0.0
1414
dune_profile: 'debug-runtime'
15-
runparam: 's=4096,v=0,V=1'
15+
runparam: 's=4096,V=1'
1616
timeout: 240

.github/workflows/linux-51x-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ jobs:
1212
with:
1313
compiler_ref: refs/tags/5.1.1
1414
dune_profile: 'debug-runtime'
15-
runparam: 's=4096,v=0,V=1'
15+
runparam: 's=4096,V=1'
1616
timeout: 240

.github/workflows/linux-520-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
with:
1717
compiler_ref: refs/tags/5.2.0
1818
dune_profile: 'debug-runtime'
19-
runparam: 's=4096,v=0,V=1'
19+
runparam: 's=4096,V=1'
2020
timeout: 240

.github/workflows/linux-530-trunk-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
with:
1717
compiler_ref: refs/heads/5.3
1818
dune_profile: 'debug-runtime'
19-
runparam: 's=4096,v=0,V=1'
19+
runparam: 's=4096,V=1'
2020
timeout: 240

.github/workflows/linux-540-trunk-debug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ jobs:
1616
with:
1717
compiler_ref: refs/heads/trunk
1818
dune_profile: 'debug-runtime'
19-
runparam: 's=4096,v=0,V=1'
19+
runparam: 's=4096,V=1'
2020
timeout: 240

dune

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,27 @@
1616
(package multicoretests)
1717
(deps (alias src/default)))
1818

19+
; The main test alias
20+
(alias
21+
(name testsuite)
22+
(package multicoretests)
23+
(deps
24+
(alias_rec src/runtest)))
25+
26+
; The internal tests alias
27+
(alias
28+
(name internaltests)
29+
(package multicoretests)
30+
(deps
31+
(alias_rec test/runtest)))
32+
1933
; The aliases to control what is run in CI
2034
; It can either be the full test suite, or focus on a single test
21-
; Aliases ci1 and ci2 are useful to split the test suite into
22-
; subparts, for platforms such as Cygwin which are too slow
2335
(alias
2436
(name ci)
2537
(package multicoretests)
2638
(deps
27-
(alias_rec %{env:DUNE_CI_ALIAS=runtest})))
39+
(alias_rec %{env:DUNE_CI_ALIAS=testsuite})))
2840
; (alias_rec focusedtest)))
2941

3042
; @focusedtest

src/array/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
(flags (:standard -w -27))
1616
(libraries qcheck-lin.domain)
1717
; (action (run %{test} --verbose))
18-
(action (echo "Skipping src/array/%{test} from the test suite\n\n"))
18+
(action (progn))
1919
)
2020

2121
(test

src/atomic/dune

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
(flags (:standard -w -27))
2020
(libraries qcheck-lin.domain)
2121
; (action (run %{test} --verbose))
22-
(action (echo "Skipping src/atomic/%{test} from the test suite\n\n"))
22+
(action (progn))
2323
)
2424

2525
(test

0 commit comments

Comments
 (0)