Skip to content

Commit

Permalink
Promote expected changes in the testsuite
Browse files Browse the repository at this point in the history
  • Loading branch information
@voodoos
voodoos committed Feb 25, 2025
1 parent 0625c01 commit 45a4bad
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 57 deletions.
6 changes: 4 additions & 2 deletions test/blackbox-tests/test-cases/github2206.t/run.t
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
copy_files would break the generation of the preprocessing flags
$ dune build copy_files/.merlin-conf/exe-foo
$ dune ocaml merlin dump-config $PWD/copy_files |
> grep -B 1 -A 0 "pp"
> grep -B 2 -A 0 "pp"
Foo: _build/default/copy_files/foo
((INDEX $TESTCASE_ROOT/_build/default/.pp.eobjs/cctx.ocaml-index)
--
(S $TESTCASE_ROOT/copy_files/sources)
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected] -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-pp $TESTCASE_ROOT/_build/default/pp.exe))
--
(UNIT_NAME foo))
Foo: _build/default/copy_files/foo.ml
((INDEX $TESTCASE_ROOT/_build/default/.pp.eobjs/cctx.ocaml-index)
--
(S $TESTCASE_ROOT/copy_files/sources)
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected] -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-pp $TESTCASE_ROOT/_build/default/pp.exe))
12 changes: 6 additions & 6 deletions test/blackbox-tests/test-cases/melange/merlin.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,37 +133,37 @@ User ppx flags should appear in merlin config
(STDLIB /MELC_STDLIB/melange)
(SOURCE_ROOT $TESTCASE_ROOT)
(EXCLUDE_QUERY_DIR)
(FLG (-open Foo))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(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))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(FLG (-open Foo))
(UNIT_NAME foo__Bar))
Bar: _build/default/bar.ml
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
(INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
(STDLIB /MELC_STDLIB/melange)
(SOURCE_ROOT $TESTCASE_ROOT)
(EXCLUDE_QUERY_DIR)
(FLG (-open Foo))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(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))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(FLG (-open Foo))
(UNIT_NAME foo__Bar))
Foo: _build/default/foo
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
(INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
(STDLIB /MELC_STDLIB/melange)
(SOURCE_ROOT $TESTCASE_ROOT)
(EXCLUDE_QUERY_DIR)
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(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))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(UNIT_NAME foo))
Foo: _build/default/foo.ml-gen
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
(INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
(STDLIB /MELC_STDLIB/melange)
(SOURCE_ROOT $TESTCASE_ROOT)
(EXCLUDE_QUERY_DIR)
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(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))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/4128e43a9cfb141a37f547484cc9bf46/ppx.exe --as-ppx --cookie 'library-name="foo"'"))
(UNIT_NAME foo))
Fooppx: _build/default/fooppx
((INDEX $TESTCASE_ROOT/_build/default/.fooppx.objs/cctx.ocaml-index)
Expand Down
8 changes: 4 additions & 4 deletions test/blackbox-tests/test-cases/merlin/github1946.t/run.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ in the same dune file, but require different ppx specifications
(EXCLUDE_QUERY_DIR)
(B $TESTCASE_ROOT/_build/default/.usesppx1.objs/byte)
(S $TESTCASE_ROOT)
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
(FLG (-w -40 -g))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
(UNIT_NAME usesppx1))
Usesppx1: _build/default/usesppx1.ml-gen
((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
Expand All @@ -29,8 +29,8 @@ in the same dune file, but require different ppx specifications
(EXCLUDE_QUERY_DIR)
(B $TESTCASE_ROOT/_build/default/.usesppx1.objs/byte)
(S $TESTCASE_ROOT)
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
(FLG (-w -40 -g))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/c152d6ca3c7e1d83471ffdf48bf729ae/ppx.exe --as-ppx --cookie 'library-name="usesppx1"'"))
(UNIT_NAME usesppx1))
Usesppx2: _build/default/usesppx2
((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
Expand All @@ -42,8 +42,8 @@ in the same dune file, but require different ppx specifications
(EXCLUDE_QUERY_DIR)
(B $TESTCASE_ROOT/_build/default/.usesppx2.objs/byte)
(S $TESTCASE_ROOT)
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
(FLG (-w -40 -g))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
(UNIT_NAME usesppx2))
Usesppx2: _build/default/usesppx2.ml-gen
((INDEX $TESTCASE_ROOT/_build/default/.usesppx2.objs/cctx.ocaml-index)
Expand All @@ -55,6 +55,6 @@ in the same dune file, but require different ppx specifications
(EXCLUDE_QUERY_DIR)
(B $TESTCASE_ROOT/_build/default/.usesppx2.objs/byte)
(S $TESTCASE_ROOT)
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
(FLG (-w -40 -g))
(FLG (-ppx "$TESTCASE_ROOT/_build/default/.ppx/d7394c27c5e0f7ad7ab1110d6b092c05/ppx.exe --as-ppx --cookie 'library-name="usesppx2"'"))
(UNIT_NAME usesppx2))
14 changes: 7 additions & 7 deletions test/blackbox-tests/test-cases/merlin/granularity.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,9 @@ Is it expected that the suffix for implementation and interface is the same ?
(?:EXCLUDE_QUERY_DIR
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
(?:S?:$TESTCASE_ROOT
(?:FLG(?:-open?:Dune__exe)
(?:FLG(?:-pp?:$TESTCASE_ROOT/_build/default/pp.sh)
(?: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)
(?:FLG(?:-pp?:$TESTCASE_ROOT/_build/default/pp.sh)
(?:FLG(?:-open?:Dune__exe)
(?:UNIT_NAME?:dune__exe__Pped
(?:SUFFIX?:.mlx .mlx))

Expand All @@ -141,8 +141,8 @@ As expected, the reader is not communicated for the standard mli
(?:EXCLUDE_QUERY_DIR
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
(?:S?:$TESTCASE_ROOT
(?:FLG(?:-open?:Dune__exe)
(?: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)
(?:FLG(?:-open?:Dune__exe)
(?:UNIT_NAME?:dune__exe__Mel
(?:SUFFIX?:.mlx .mlx))

Expand Down Expand Up @@ -173,8 +173,8 @@ found, then it'll make a guess that the file was preprocessed into a file with
(?:EXCLUDE_QUERY_DIR
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
(?:S?:$TESTCASE_ROOT
(?:FLG(?:-open?:Dune__exe)
(?: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)
(?:FLG(?:-open?:Dune__exe)
(?:UNIT_NAME?:dune__exe__Cppomod
(?:SUFFIX?:.mlx .mlx))

Expand All @@ -195,8 +195,8 @@ We could expect dune to get the wrongext module configuration
(?:EXCLUDE_QUERY_DIR
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
(?:S?:$TESTCASE_ROOT
(?:FLG(?:-open?:Dune__exe)
(?: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)
(?:FLG(?:-open?:Dune__exe)
(?:UNIT_NAME?:dune__exe__Wrongext
(?:SUFFIX?:.mlx .mlx))

Expand All @@ -213,8 +213,8 @@ It should be possible to get its merlin configuration as well:
(?:EXCLUDE_QUERY_DIR
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
(?:S?:$TESTCASE_ROOT
(?:FLG(?:-open?:Dune__exe)
(?: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)
(?:FLG(?:-open?:Dune__exe)
(?:UNIT_NAME?:dune__exe__Generated
(?:SUFFIX?:.mlx .mlx))
$ ./merlin_conf.sh generatedx.mlx
Expand All @@ -224,8 +224,8 @@ It should be possible to get its merlin configuration as well:
(?:EXCLUDE_QUERY_DIR
(?:B?:$TESTCASE_ROOT/_build/default/.test.eobjs/byte
(?:S?:$TESTCASE_ROOT
(?:FLG(?:-open?:Dune__exe)
(?: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)
(?:FLG(?:-open?:Dune__exe)
(?:UNIT_NAME?:dune__exe__Generatedx
(?:SUFFIX?:.mlx .mlx
(?:READER(?:mlx)))
16 changes: 8 additions & 8 deletions test/blackbox-tests/test-cases/merlin/include-subdirs-qualified.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo__Groupintf__ -open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo__Groupintf__ -open Foo))
(UNIT_NAME foo__Groupintf__Calc))
Calc: _build/default/groupintf/calc.ml
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -108,8 +108,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo__Groupintf__ -open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo__Groupintf__ -open Foo))
(UNIT_NAME foo__Groupintf__Calc))
Groupintf: _build/default/groupintf/groupintf
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -120,8 +120,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo__Groupintf__ -open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo__Groupintf__ -open Foo))
(UNIT_NAME foo__Groupintf))
Groupintf: _build/default/groupintf/groupintf.ml
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -132,8 +132,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo__Groupintf__ -open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo__Groupintf__ -open Foo))
(UNIT_NAME foo__Groupintf))
Main: _build/default/main
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -144,8 +144,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo))
(UNIT_NAME foo__Main))
Main: _build/default/main.ml
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -156,8 +156,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo))
(UNIT_NAME foo__Main))
Calc: _build/default/utils/calc
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -168,8 +168,8 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo__Utils -open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo__Utils -open Foo))
(UNIT_NAME foo__Utils__Calc))
Calc: _build/default/utils/calc.ml
((INDEX $TESTCASE_ROOT/_build/default/.foo.objs/cctx.ocaml-index)
Expand All @@ -180,7 +180,7 @@
(S $TESTCASE_ROOT)
(S $TESTCASE_ROOT/groupintf)
(S $TESTCASE_ROOT/utils)
(FLG (-open Foo__Utils -open Foo))
(FLG (-w @1..3@5[email protected]@[email protected]@[email protected]@67@69-40 -strict-sequence -strict-formats -short-paths -keep-locs -g))
(FLG (-open Foo__Utils -open Foo))
(UNIT_NAME foo__Utils__Calc))
$ dune ocaml merlin dump-config utils
8 changes: 4 additions & 4 deletions test/blackbox-tests/test-cases/merlin/instrumentation.t/run.t
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ up a project with instrumentation and testing checking the merlin config.
(S $TESTCASE_ROOT/lib)
(S $TESTCASE_ROOT/lib/subdir)
(S $TESTCASE_ROOT/ppx)
(FLG (-open Bar))
(FLG (-w -40 -g))
(FLG (-open Bar))
(UNIT_NAME bar__File))
File: _build/default/lib/subdir/file.ml
((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
Expand All @@ -71,8 +71,8 @@ up a project with instrumentation and testing checking the merlin config.
(S $TESTCASE_ROOT/lib)
(S $TESTCASE_ROOT/lib/subdir)
(S $TESTCASE_ROOT/ppx)
(FLG (-open Bar))
(FLG (-w -40 -g))
(FLG (-open Bar))
(UNIT_NAME bar__File))
Foo: _build/default/lib/foo
((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
Expand Down Expand Up @@ -120,8 +120,8 @@ up a project with instrumentation and testing checking the merlin config.
(S $TESTCASE_ROOT/lib)
(S $TESTCASE_ROOT/lib/subdir)
(S $TESTCASE_ROOT/ppx)
(FLG (-open Foo))
(FLG (-w -40 -g))
(FLG (-open Foo))
(UNIT_NAME foo__Privmod))
Privmod: _build/default/lib/privmod.ml
((INDEX $TESTCASE_ROOT/_build/default/exe/.x.eobjs/cctx.ocaml-index)
Expand All @@ -137,6 +137,6 @@ up a project with instrumentation and testing checking the merlin config.
(S $TESTCASE_ROOT/lib)
(S $TESTCASE_ROOT/lib/subdir)
(S $TESTCASE_ROOT/ppx)
(FLG (-open Foo))
(FLG (-w -40 -g))
(FLG (-open Foo))
(UNIT_NAME foo__Privmod))
Loading

0 comments on commit 45a4bad

Please sign in to comment.