Skip to content

Commit 09fd76a

Browse files
voodoosvoodoos
committed
Promote expected changes in the testsuite
Signed-off-by: Ulysse Gérard <thevoodoos@gmail.com>
1 parent 58bb8ea commit 09fd76a

File tree

10 files changed

+59
-57
lines changed

10 files changed

+59
-57
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
copy_files would break the generation of the preprocessing flags
22
$ dune build copy_files/.merlin-conf/exe-foo
33
$ dune ocaml merlin dump-config $PWD/copy_files |
4-
> grep -B 1 -A 0 "pp"
4+
> grep -B 2 -A 0 "pp"
55
Foo: _build/default/copy_files/foo
66
((INDEX $TESTCASE_ROOT/_build/default/.pp.eobjs/cctx.ocaml-index)
77
--
88
(S $TESTCASE_ROOT/copy_files/sources)
9+
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
910
(FLG (-pp $TESTCASE_ROOT/_build/default/pp.exe))
10-
--
11+
(UNIT_NAME foo))
1112
Foo: _build/default/copy_files/foo.ml
1213
((INDEX $TESTCASE_ROOT/_build/default/.pp.eobjs/cctx.ocaml-index)
1314
--
1415
(S $TESTCASE_ROOT/copy_files/sources)
16+
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
1517
(FLG (-pp $TESTCASE_ROOT/_build/default/pp.exe))

‎test/blackbox-tests/test-cases/melange/merlin.t‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -133,37 +133,37 @@ User ppx flags should appear in merlin config
133133
(STDLIB /MELC_STDLIB/melange)
134134
(SOURCE_ROOT $TESTCASE_ROOT)
135135
(EXCLUDE_QUERY_DIR)
136-
(FLG (-open Foo))
137-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
138136
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
137+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
138+
(FLG (-open Foo))
139139
(UNIT_NAME foo__Bar))
140140
Bar: _build/default/bar.ml
141141
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
142142
(INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
143143
(STDLIB /MELC_STDLIB/melange)
144144
(SOURCE_ROOT $TESTCASE_ROOT)
145145
(EXCLUDE_QUERY_DIR)
146-
(FLG (-open Foo))
147-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
148146
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
147+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
148+
(FLG (-open Foo))
149149
(UNIT_NAME foo__Bar))
150150
Foo: _build/default/foo
151151
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
152152
(INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
153153
(STDLIB /MELC_STDLIB/melange)
154154
(SOURCE_ROOT $TESTCASE_ROOT)
155155
(EXCLUDE_QUERY_DIR)
156-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
157156
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
157+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
158158
(UNIT_NAME foo))
159159
Foo: _build/default/foo.ml-gen
160160
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
161161
(INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
162162
(STDLIB /MELC_STDLIB/melange)
163163
(SOURCE_ROOT $TESTCASE_ROOT)
164164
(EXCLUDE_QUERY_DIR)
165-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
166165
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
166+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
167167
(UNIT_NAME foo))
168168
Fooppx: _build/default/fooppx
169169
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)

‎test/blackbox-tests/test-cases/merlin/github1946.t/run.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ in the same dune file, but require different ppx specifications
1616
(EXCLUDE_QUERY_DIR)
1717
(B $TESTCASE_ROOT/_build/default/.usesppx1.objs/byte)
1818
(S $TESTCASE_ROOT)
19-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
2019
(FLG (-w -40 -g))
20+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
2121
(UNIT_NAME usesppx1))
2222
Usesppx1: _build/default/usesppx1.ml-gen
2323
((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
@@ -29,8 +29,8 @@ in the same dune file, but require different ppx specifications
2929
(EXCLUDE_QUERY_DIR)
3030
(B $TESTCASE_ROOT/_build/default/.usesppx1.objs/byte)
3131
(S $TESTCASE_ROOT)
32-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
3332
(FLG (-w -40 -g))
33+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
3434
(UNIT_NAME usesppx1))
3535
Usesppx2: _build/default/usesppx2
3636
((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
@@ -42,8 +42,8 @@ in the same dune file, but require different ppx specifications
4242
(EXCLUDE_QUERY_DIR)
4343
(B $TESTCASE_ROOT/_build/default/.usesppx2.objs/byte)
4444
(S $TESTCASE_ROOT)
45-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
4645
(FLG (-w -40 -g))
46+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
4747
(UNIT_NAME usesppx2))
4848
Usesppx2: _build/default/usesppx2.ml-gen
4949
((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
@@ -55,6 +55,6 @@ in the same dune file, but require different ppx specifications
5555
(EXCLUDE_QUERY_DIR)
5656
(B $TESTCASE_ROOT/_build/default/.usesppx2.objs/byte)
5757
(S $TESTCASE_ROOT)
58-
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
5958
(FLG (-w -40 -g))
59+
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
6060
(UNIT_NAME usesppx2))

‎test/blackbox-tests/test-cases/merlin/granularity.t‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,9 @@ Is it expected that the suffix for implementation and interface is the same ?
123123
(?:EXCLUDE_QUERY_DIR
124124
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
125125
(?:S?:$TESTCASE_ROOT
126-
(?:FLG(?:-open?:Dune__exe)
127-
(?:FLG(?:-pp?:$TESTCASE_ROOT/_build/default/pp.sh)
128126
(?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
127+
(?:FLG(?:-pp?:$TESTCASE_ROOT/_build/default/pp.sh)
128+
(?:FLG(?:-open?:Dune__exe)
129129
(?:UNIT_NAME?:dune__exe__Pped
130130
(?:SUFFIX?:.mlx .mlx))
131131

@@ -141,8 +141,8 @@ As expected, the reader is not communicated for the standard mli
141141
(?:EXCLUDE_QUERY_DIR
142142
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
143143
(?:S?:$TESTCASE_ROOT
144-
(?:FLG(?:-open?:Dune__exe)
145144
(?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
145+
(?:FLG(?:-open?:Dune__exe)
146146
(?:UNIT_NAME?:dune__exe__Mel
147147
(?:SUFFIX?:.mlx .mlx))
148148

@@ -173,8 +173,8 @@ found, then it'll make a guess that the file was preprocessed into a file with
173173
(?:EXCLUDE_QUERY_DIR
174174
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
175175
(?:S?:$TESTCASE_ROOT
176-
(?:FLG(?:-open?:Dune__exe)
177176
(?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
177+
(?:FLG(?:-open?:Dune__exe)
178178
(?:UNIT_NAME?:dune__exe__Cppomod
179179
(?:SUFFIX?:.mlx .mlx))
180180

@@ -195,8 +195,8 @@ We could expect dune to get the wrongext module configuration
195195
(?:EXCLUDE_QUERY_DIR
196196
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
197197
(?:S?:$TESTCASE_ROOT
198-
(?:FLG(?:-open?:Dune__exe)
199198
(?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
199+
(?:FLG(?:-open?:Dune__exe)
200200
(?:UNIT_NAME?:dune__exe__Wrongext
201201
(?:SUFFIX?:.mlx .mlx))
202202

@@ -213,8 +213,8 @@ It should be possible to get its merlin configuration as well:
213213
(?:EXCLUDE_QUERY_DIR
214214
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
215215
(?:S?:$TESTCASE_ROOT
216-
(?:FLG(?:-open?:Dune__exe)
217216
(?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
217+
(?:FLG(?:-open?:Dune__exe)
218218
(?:UNIT_NAME?:dune__exe__Generated
219219
(?:SUFFIX?:.mlx .mlx))
220220
$ ./merlin_conf.sh generatedx.mlx
@@ -224,8 +224,8 @@ It should be possible to get its merlin configuration as well:
224224
(?:EXCLUDE_QUERY_DIR
225225
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
226226
(?:S?:$TESTCASE_ROOT
227-
(?:FLG(?:-open?:Dune__exe)
228227
(?:FLG(?:-w?:@1..3@5..28@31..39@43@46..47@49..57@61..62@67@69-?:-strict-sequence?:-strict-formats?:-short-paths?:-keep-locs?:-no-strict-formats?:-g)
228+
(?:FLG(?:-open?:Dune__exe)
229229
(?:UNIT_NAME?:dune__exe__Generatedx
230230
(?:SUFFIX?:.mlx .mlx
231231
(?:READER(?:mlx)))

‎test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@
9696
(S $TESTCASE_ROOT)
9797
(S $TESTCASE_ROOT/groupintf)
9898
(S $TESTCASE_ROOT/utils)
99-
(FLG (-open Foo__Groupintf__ -open Foo))
10099
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
100+
(FLG (-open Foo__Groupintf__ -open Foo))
101101
(UNIT_NAME foo__Groupintf__Calc))
102102
Calc: _build/default/groupintf/calc.ml
103103
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -108,8 +108,8 @@
108108
(S $TESTCASE_ROOT)
109109
(S $TESTCASE_ROOT/groupintf)
110110
(S $TESTCASE_ROOT/utils)
111-
(FLG (-open Foo__Groupintf__ -open Foo))
112111
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
112+
(FLG (-open Foo__Groupintf__ -open Foo))
113113
(UNIT_NAME foo__Groupintf__Calc))
114114
Groupintf: _build/default/groupintf/groupintf
115115
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -120,8 +120,8 @@
120120
(S $TESTCASE_ROOT)
121121
(S $TESTCASE_ROOT/groupintf)
122122
(S $TESTCASE_ROOT/utils)
123-
(FLG (-open Foo__Groupintf__ -open Foo))
124123
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
124+
(FLG (-open Foo__Groupintf__ -open Foo))
125125
(UNIT_NAME foo__Groupintf))
126126
Groupintf: _build/default/groupintf/groupintf.ml
127127
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -132,8 +132,8 @@
132132
(S $TESTCASE_ROOT)
133133
(S $TESTCASE_ROOT/groupintf)
134134
(S $TESTCASE_ROOT/utils)
135-
(FLG (-open Foo__Groupintf__ -open Foo))
136135
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
136+
(FLG (-open Foo__Groupintf__ -open Foo))
137137
(UNIT_NAME foo__Groupintf))
138138
Main: _build/default/main
139139
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -144,8 +144,8 @@
144144
(S $TESTCASE_ROOT)
145145
(S $TESTCASE_ROOT/groupintf)
146146
(S $TESTCASE_ROOT/utils)
147-
(FLG (-open Foo))
148147
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
148+
(FLG (-open Foo))
149149
(UNIT_NAME foo__Main))
150150
Main: _build/default/main.ml
151151
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -156,8 +156,8 @@
156156
(S $TESTCASE_ROOT)
157157
(S $TESTCASE_ROOT/groupintf)
158158
(S $TESTCASE_ROOT/utils)
159-
(FLG (-open Foo))
160159
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
160+
(FLG (-open Foo))
161161
(UNIT_NAME foo__Main))
162162
Calc: _build/default/utils/calc
163163
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -168,8 +168,8 @@
168168
(S $TESTCASE_ROOT)
169169
(S $TESTCASE_ROOT/groupintf)
170170
(S $TESTCASE_ROOT/utils)
171-
(FLG (-open Foo__Utils -open Foo))
172171
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
172+
(FLG (-open Foo__Utils -open Foo))
173173
(UNIT_NAME foo__Utils__Calc))
174174
Calc: _build/default/utils/calc.ml
175175
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
@@ -180,7 +180,7 @@
180180
(S $TESTCASE_ROOT)
181181
(S $TESTCASE_ROOT/groupintf)
182182
(S $TESTCASE_ROOT/utils)
183-
(FLG (-open Foo__Utils -open Foo))
184183
(FLG (-w @1..3@5..28@30..39@43@46..47@49..57@61..62@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
184+
(FLG (-open Foo__Utils -open Foo))
185185
(UNIT_NAME foo__Utils__Calc))
186186
$ dune ocaml merlin dump-config utils

‎test/blackbox-tests/test-cases/merlin/instrumentation.t/run.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ up a project with instrumentation and testing checking the merlin config.
5454
(S $TESTCASE_ROOT/lib)
5555
(S $TESTCASE_ROOT/lib/subdir)
5656
(S $TESTCASE_ROOT/ppx)
57-
(FLG (-open Bar))
5857
(FLG (-w -40 -g))
58+
(FLG (-open Bar))
5959
(UNIT_NAME bar__File))
6060
File: _build/default/lib/subdir/file.ml
6161
((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -71,8 +71,8 @@ up a project with instrumentation and testing checking the merlin config.
7171
(S $TESTCASE_ROOT/lib)
7272
(S $TESTCASE_ROOT/lib/subdir)
7373
(S $TESTCASE_ROOT/ppx)
74-
(FLG (-open Bar))
7574
(FLG (-w -40 -g))
75+
(FLG (-open Bar))
7676
(UNIT_NAME bar__File))
7777
Foo: _build/default/lib/foo
7878
((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -120,8 +120,8 @@ up a project with instrumentation and testing checking the merlin config.
120120
(S $TESTCASE_ROOT/lib)
121121
(S $TESTCASE_ROOT/lib/subdir)
122122
(S $TESTCASE_ROOT/ppx)
123-
(FLG (-open Foo))
124123
(FLG (-w -40 -g))
124+
(FLG (-open Foo))
125125
(UNIT_NAME foo__Privmod))
126126
Privmod: _build/default/lib/privmod.ml
127127
((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
@@ -137,6 +137,6 @@ up a project with instrumentation and testing checking the merlin config.
137137
(S $TESTCASE_ROOT/lib)
138138
(S $TESTCASE_ROOT/lib/subdir)
139139
(S $TESTCASE_ROOT/ppx)
140-
(FLG (-open Foo))
141140
(FLG (-w -40 -g))
141+
(FLG (-open Foo))
142142
(UNIT_NAME foo__Privmod))

0 commit comments

Comments
 (0)