Skip to content

Commit 2cf80e1

Browse files
maistemaiste
committed
test: promote to 3.19 with latest bump
Signed-off-by: Etienne Marais <[email protected]>
1 parent e0ee27a commit 2cf80e1

File tree

13 files changed

+62
-110
lines changed

13 files changed

+62
-110
lines changed

‎doc/test/run.t

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,15 @@ is fine, but you then need to update the list of such exceptions below.
88

99
$ DUNE_LANG=$(dune internal latest-lang-version)
1010
$ grep '(lang dune' ../*.rst | grep -v "$DUNE_LANG"
11+
../coq.rst: (lang dune 3.18)
12+
../coq.rst: (lang dune 3.18)
13+
../foreign-code.rst: (lang dune 3.18)
1114
../hacking.rst:``(lang dune 2.7)`` in their ``dune`` project file to use it.
15+
../hacking.rst: (lang dune 3.18)
16+
../instrumentation.rst: (lang dune 3.18)
17+
../instrumentation.rst: (lang dune 3.18)
18+
../melange.rst: (lang dune 3.18)
19+
../sites.rst: (lang dune 3.18)
20+
../sites.rst: (lang dune 3.18)
21+
../sites.rst: (lang dune 3.18)
1222
../tests.rst: (lang dune 2.7)

‎test/blackbox-tests/test-cases/describe/describe-workspace-pp.t

Lines changed: 19 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -104,20 +104,13 @@ not stable across different setups.
104104
(executables
105105
((names (exe))
106106
(requires
107-
(c39d8e11db2363236e69af7750ce7b9a
108-
c9367091ddd9a70d99fc22ede348f17c
109-
1f2b5eb300ea716920494385a31bb5fb
110-
5014e215e204cf8da6c32644cda1b31e
111-
249b2edaf3cc552a247667041bb5f015
112-
ba85adfb1c97e7d7af3df35b16b2fc0d
113-
2363fd46dac995a1c79679dfa1a9881b
114-
43b7cbe1f93f4f502ec614971027cff9
115-
e68a558facd1546b51c7abdbf6aed1cb
116-
24f4eb12e3ff51b310dbf7443c6087be
117-
449445be7a24ce51e119d57e9e255d3f
118-
5ae836dcdead11d5c16815297c5a1ae6
119-
2c61db8e94cb08e0fe642152aee8121a
120-
6fb5d46437c55abca48c8b995f8afa51
107+
(c39d8e11db2363236e69af7750ce7b9a c9367091ddd9a70d99fc22ede348f17c
108+
1f2b5eb300ea716920494385a31bb5fb 5014e215e204cf8da6c32644cda1b31e
109+
249b2edaf3cc552a247667041bb5f015 ba85adfb1c97e7d7af3df35b16b2fc0d
110+
2363fd46dac995a1c79679dfa1a9881b 43b7cbe1f93f4f502ec614971027cff9
111+
e68a558facd1546b51c7abdbf6aed1cb 24f4eb12e3ff51b310dbf7443c6087be
112+
449445be7a24ce51e119d57e9e255d3f 5ae836dcdead11d5c16815297c5a1ae6
113+
2c61db8e94cb08e0fe642152aee8121a 6fb5d46437c55abca48c8b995f8afa51
121114
f9851d3f8ae32391e7594cf97332a78c))
122115
(modules
123116
(((name Exe)
@@ -147,8 +140,7 @@ not stable across different setups.
147140
(uid f9851d3f8ae32391e7594cf97332a78c)
148141
(local true)
149142
(requires
150-
(ba85adfb1c97e7d7af3df35b16b2fc0d
151-
2c61db8e94cb08e0fe642152aee8121a
143+
(ba85adfb1c97e7d7af3df35b16b2fc0d 2c61db8e94cb08e0fe642152aee8121a
152144
6fb5d46437c55abca48c8b995f8afa51))
153145
(source_dir _build/default/dummy_ppx)
154146
(modules
@@ -187,16 +179,11 @@ not stable across different setups.
187179
(uid 2c61db8e94cb08e0fe642152aee8121a)
188180
(local false)
189181
(requires
190-
(ba85adfb1c97e7d7af3df35b16b2fc0d
191-
2363fd46dac995a1c79679dfa1a9881b
192-
5014e215e204cf8da6c32644cda1b31e
193-
43b7cbe1f93f4f502ec614971027cff9
194-
e68a558facd1546b51c7abdbf6aed1cb
195-
24f4eb12e3ff51b310dbf7443c6087be
196-
5ae836dcdead11d5c16815297c5a1ae6
197-
249b2edaf3cc552a247667041bb5f015
198-
449445be7a24ce51e119d57e9e255d3f
199-
c9367091ddd9a70d99fc22ede348f17c))
182+
(ba85adfb1c97e7d7af3df35b16b2fc0d 2363fd46dac995a1c79679dfa1a9881b
183+
5014e215e204cf8da6c32644cda1b31e 43b7cbe1f93f4f502ec614971027cff9
184+
e68a558facd1546b51c7abdbf6aed1cb 24f4eb12e3ff51b310dbf7443c6087be
185+
5ae836dcdead11d5c16815297c5a1ae6 249b2edaf3cc552a247667041bb5f015
186+
449445be7a24ce51e119d57e9e255d3f c9367091ddd9a70d99fc22ede348f17c))
200187
(source_dir /FINDLIB/ppxlib)
201188
(modules ())
202189
(include_dirs (/FINDLIB/ppxlib))))
@@ -297,8 +284,7 @@ not stable across different setups.
297284
(uid f9851d3f8ae32391e7594cf97332a78c)
298285
(local true)
299286
(requires
300-
(ba85adfb1c97e7d7af3df35b16b2fc0d
301-
2c61db8e94cb08e0fe642152aee8121a
287+
(ba85adfb1c97e7d7af3df35b16b2fc0d 2c61db8e94cb08e0fe642152aee8121a
302288
6fb5d46437c55abca48c8b995f8afa51))
303289
(source_dir _build/default/dummy_ppx)
304290
(modules
@@ -350,16 +336,11 @@ not stable across different setups.
350336
(uid 2c61db8e94cb08e0fe642152aee8121a)
351337
(local false)
352338
(requires
353-
(ba85adfb1c97e7d7af3df35b16b2fc0d
354-
2363fd46dac995a1c79679dfa1a9881b
355-
5014e215e204cf8da6c32644cda1b31e
356-
43b7cbe1f93f4f502ec614971027cff9
357-
e68a558facd1546b51c7abdbf6aed1cb
358-
24f4eb12e3ff51b310dbf7443c6087be
359-
5ae836dcdead11d5c16815297c5a1ae6
360-
249b2edaf3cc552a247667041bb5f015
361-
449445be7a24ce51e119d57e9e255d3f
362-
c9367091ddd9a70d99fc22ede348f17c))
339+
(ba85adfb1c97e7d7af3df35b16b2fc0d 2363fd46dac995a1c79679dfa1a9881b
340+
5014e215e204cf8da6c32644cda1b31e 43b7cbe1f93f4f502ec614971027cff9
341+
e68a558facd1546b51c7abdbf6aed1cb 24f4eb12e3ff51b310dbf7443c6087be
342+
5ae836dcdead11d5c16815297c5a1ae6 249b2edaf3cc552a247667041bb5f015
343+
449445be7a24ce51e119d57e9e255d3f c9367091ddd9a70d99fc22ede348f17c))
363344
(source_dir /FINDLIB/ppxlib)
364345
(modules ())
365346
(include_dirs (/FINDLIB/ppxlib))))

‎test/blackbox-tests/test-cases/describe/describe.t

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -546,16 +546,11 @@ not stable across different setups.
546546
(uid 2c61db8e94cb08e0fe642152aee8121a)
547547
(local false)
548548
(requires
549-
(ba85adfb1c97e7d7af3df35b16b2fc0d
550-
2363fd46dac995a1c79679dfa1a9881b
551-
5014e215e204cf8da6c32644cda1b31e
552-
43b7cbe1f93f4f502ec614971027cff9
553-
e68a558facd1546b51c7abdbf6aed1cb
554-
24f4eb12e3ff51b310dbf7443c6087be
555-
5ae836dcdead11d5c16815297c5a1ae6
556-
249b2edaf3cc552a247667041bb5f015
557-
449445be7a24ce51e119d57e9e255d3f
558-
c9367091ddd9a70d99fc22ede348f17c))
549+
(ba85adfb1c97e7d7af3df35b16b2fc0d 2363fd46dac995a1c79679dfa1a9881b
550+
5014e215e204cf8da6c32644cda1b31e 43b7cbe1f93f4f502ec614971027cff9
551+
e68a558facd1546b51c7abdbf6aed1cb 24f4eb12e3ff51b310dbf7443c6087be
552+
5ae836dcdead11d5c16815297c5a1ae6 249b2edaf3cc552a247667041bb5f015
553+
449445be7a24ce51e119d57e9e255d3f c9367091ddd9a70d99fc22ede348f17c))
559554
(source_dir /FINDLIB/ppxlib)
560555
(modules ())
561556
(include_dirs (/FINDLIB/ppxlib))))
@@ -1121,16 +1116,11 @@ not stable across different setups.
11211116
(uid 2c61db8e94cb08e0fe642152aee8121a)
11221117
(local false)
11231118
(requires
1124-
(ba85adfb1c97e7d7af3df35b16b2fc0d
1125-
2363fd46dac995a1c79679dfa1a9881b
1126-
5014e215e204cf8da6c32644cda1b31e
1127-
43b7cbe1f93f4f502ec614971027cff9
1128-
e68a558facd1546b51c7abdbf6aed1cb
1129-
24f4eb12e3ff51b310dbf7443c6087be
1130-
5ae836dcdead11d5c16815297c5a1ae6
1131-
249b2edaf3cc552a247667041bb5f015
1132-
449445be7a24ce51e119d57e9e255d3f
1133-
c9367091ddd9a70d99fc22ede348f17c))
1119+
(ba85adfb1c97e7d7af3df35b16b2fc0d 2363fd46dac995a1c79679dfa1a9881b
1120+
5014e215e204cf8da6c32644cda1b31e 43b7cbe1f93f4f502ec614971027cff9
1121+
e68a558facd1546b51c7abdbf6aed1cb 24f4eb12e3ff51b310dbf7443c6087be
1122+
5ae836dcdead11d5c16815297c5a1ae6 249b2edaf3cc552a247667041bb5f015
1123+
449445be7a24ce51e119d57e9e255d3f c9367091ddd9a70d99fc22ede348f17c))
11341124
(source_dir /FINDLIB/ppxlib)
11351125
(modules ())
11361126
(include_dirs (/FINDLIB/ppxlib))))

‎test/blackbox-tests/test-cases/directory-targets/installed-dependency.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Allow directories to be installable
2525
Leaving directory 'a'
2626

2727
$ cat a/_build/install/default/lib/foo/dune-package
28-
(lang dune 3.18)
28+
(lang dune 3.19)
2929
(name foo)
3030
(sections (lib .) (share ../../share/foo))
3131
(files (lib (META dune-package)) (share ((dir bar) x y)))

‎test/blackbox-tests/test-cases/dune-init.t/run.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ And the opam file will be generated as expected
384384
doc: "https://url/to/documentation"
385385
bug-reports: "https://github.com/username/reponame/issues"
386386
depends: [
387-
$dune {>= "3.18"}
387+
$dune {>= "3.19"}
388388
"ocaml"
389389
"odoc" {with-doc}
390390
]
@@ -495,7 +495,7 @@ And the opam file will be generated as expected
495495
doc: "https://url/to/documentation"
496496
bug-reports: "https://github.com/username/reponame/issues"
497497
depends: [
498-
"dune" {>= "3.18"}
498+
"dune" {>= "3.19"}
499499
"ocaml"
500500
"odoc" {with-doc}
501501
]

‎test/blackbox-tests/test-cases/formatting/format-dune-file.t/run.t

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,8 @@ The same file, but in the current version:
7373
$ echo '(library (name dune) (libraries unix stdune fiber xdg dune_re threads opam_file_format dune_lang ocaml_config which_program) (synopsis "Internal Dune library, do not use!") (preprocess (action (run %{project_root}/src/let-syntax/pp.exe %{input-file}))))' | dune format-dune-file
7474
(library
7575
(name dune)
76-
(libraries
77-
unix
78-
stdune
79-
fiber
80-
xdg
81-
dune_re
82-
threads
83-
opam_file_format
84-
dune_lang
85-
ocaml_config
86-
which_program)
76+
(libraries unix stdune fiber xdg dune_re threads opam_file_format dune_lang
77+
ocaml_config which_program)
8778
(synopsis "Internal Dune library, do not use!")
8879
(preprocess
8980
(action

‎test/blackbox-tests/test-cases/github7034.t/run.t

Lines changed: 10 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,8 @@ It builds on its own (with a warning) when lang dune is 3.2 or below:
1616
$ dune printenv --root=inner --field flags
1717
Entering directory 'inner'
1818
(flags
19-
(-w
20-
@[email protected]@30..39@[email protected]@[email protected]
21-
-strict-sequence
22-
-strict-formats
23-
-short-paths
24-
-keep-locs))
19+
(-w @[email protected]@30..39@[email protected]@[email protected] -strict-sequence
20+
-strict-formats -short-paths -keep-locs))
2521
Leaving directory 'inner'
2622
$ dune build --root=inner
2723
Entering directory 'inner'
@@ -41,12 +37,8 @@ Note that in versions of lang dune above 3.2 this warning becomes an error:
4137
$ dune printenv --root=inner --field flags
4238
Entering directory 'inner'
4339
(flags
44-
(-w
45-
@[email protected]@30..39@[email protected]@[email protected]@67@69-40
46-
-strict-sequence
47-
-strict-formats
48-
-short-paths
49-
-keep-locs))
40+
(-w @[email protected]@30..39@[email protected]@[email protected]@67@69-40 -strict-sequence
41+
-strict-formats -short-paths -keep-locs))
5042
Leaving directory 'inner'
5143
$ dune build --root=inner
5244
Entering directory 'inner'
@@ -68,12 +60,8 @@ Building the outer project works when lang dune is 3.2 or below:
6860
$ dune printenv --root=outer --field flags
6961
Entering directory 'outer'
7062
(flags
71-
(-w
72-
@[email protected]@30..39@[email protected]@[email protected]
73-
-strict-sequence
74-
-strict-formats
75-
-short-paths
76-
-keep-locs))
63+
(-w @[email protected]@30..39@[email protected]@[email protected] -strict-sequence
64+
-strict-formats -short-paths -keep-locs))
7765
Leaving directory 'outer'
7866
7967
$ dune build --root=outer
@@ -89,22 +77,14 @@ But when lang dune is 3.3 or higher the warning becomes an error:
8977
$ dune printenv --root=outer --field flags
9078
Entering directory 'outer'
9179
(flags
92-
(-w
93-
@[email protected]@30..39@[email protected]@[email protected]@67@69-40
94-
-strict-sequence
95-
-strict-formats
96-
-short-paths
97-
-keep-locs))
80+
(-w @[email protected]@30..39@[email protected]@[email protected]@67@69-40 -strict-sequence
81+
-strict-formats -short-paths -keep-locs))
9882
Leaving directory 'outer'
9983
$ dune printenv outer/vendored/inner --root=outer --field flags
10084
Entering directory 'outer'
10185
(flags
102-
(-w
103-
@[email protected]@30..39@[email protected]@[email protected]@67@69-40
104-
-strict-sequence
105-
-strict-formats
106-
-short-paths
107-
-keep-locs))
86+
(-w @[email protected]@30..39@[email protected]@[email protected]@67@69-40 -strict-sequence
87+
-strict-formats -short-paths -keep-locs))
10888
Leaving directory 'outer'
10989
11090
$ dune build --root=outer

‎test/blackbox-tests/test-cases/install/install-stublibs.t/run.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Begin by installing a library with C stubs.
3232
Installing install/lib/libA/libA.cmxs
3333
Installing install/lib/stublibs/dlllibA_stubs.so
3434
$ cat ./install/lib/libA/dune-package
35-
(lang dune 3.18)
35+
(lang dune 3.19)
3636
(name libA)
3737
(sections
3838
(lib

‎test/blackbox-tests/test-cases/melange/basic-install.t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Test that we can install melange mode libraries
2727
]
2828

2929
$ cat ./_build/install/default/lib/foo/dune-package
30-
(lang dune 3.18)
30+
(lang dune 3.19)
3131
(name foo)
3232
(sections (lib .))
3333
(files

‎test/blackbox-tests/test-cases/pkg/conflicts.t

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ disjunction, either package is problematic:
7676
Couldn't solve the package dependency formula.
7777
Selected candidates: bar.0.0.1 bar2.0.0.1 x.dev
7878
- dune -> dune.3.11
79-
User requested = 3.18
79+
User requested = 3.19
8080
- foo -> (problem)
8181
No usable implementations:
8282
foo.0.0.1: Package does not satisfy constraints of local package x
@@ -96,7 +96,7 @@ Adding a new version of `foo` only resolves one conflict:
9696
Couldn't solve the package dependency formula.
9797
Selected candidates: bar.0.0.1 bar2.0.0.1 foo.0.2 x.dev
9898
- dune -> dune.3.11
99-
User requested = 3.18
99+
User requested = 3.19
100100
- foo2 -> (problem)
101101
No usable implementations:
102102
foo2.0.0.1: Package does not satisfy constraints of local package x

0 commit comments

Comments
 (0)