diff --git a/test/blackbox-tests/dune.inc b/test/blackbox-tests/dune.inc index f27b7e43..b4480d6b 100644 --- a/test/blackbox-tests/dune.inc +++ b/test/blackbox-tests/dune.inc @@ -311,6 +311,14 @@ test-cases/github784 (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) +(alias + (name github992) + (deps (package dune) (source_tree test-cases/github992)) + (action + (chdir + test-cases/github992 + (progn (run %{exe:cram.exe} -test run.t) (diff? run.t run.t.corrected))))) + (alias (name ignored_subdirs) (deps (package dune) (source_tree test-cases/ignored_subdirs)) @@ -740,6 +748,7 @@ (alias github761) (alias github764) (alias github784) + (alias github992) (alias ignored_subdirs) (alias include-loop) (alias inline_tests) @@ -824,6 +833,7 @@ (alias github761) (alias github764) (alias github784) + (alias github992) (alias ignored_subdirs) (alias include-loop) (alias inline_tests) diff --git a/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/bar.opam b/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/bar.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/dune b/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/dune new file mode 100644 index 00000000..9d959ff8 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/dune @@ -0,0 +1,5 @@ +(menhir (modules a)) + +(library + (name bar) + (public_name bar)) diff --git a/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/dune-project b/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/dune-project new file mode 100644 index 00000000..0b09661e --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/dune-project @@ -0,0 +1,2 @@ +(lang dune 1.0) +(using menhir 1.0) diff --git a/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/foo.opam b/test/blackbox-tests/test-cases/github992/menhir-and-dash-p/foo.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/foo.ml b/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/foo.ml new file mode 100644 index 00000000..2ddf2486 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/foo.ml @@ -0,0 +1 @@ +print_endline "Hello, world!" diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/foo.opam b/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/foo.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/jbuild b/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/jbuild new file mode 100644 index 00000000..ff7e8241 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/package-without-pub-name-jbuild/jbuild @@ -0,0 +1,3 @@ +(executable + ((name foo) + (package foo))) diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name/dune b/test/blackbox-tests/test-cases/github992/package-without-pub-name/dune new file mode 100644 index 00000000..81fc09f9 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/package-without-pub-name/dune @@ -0,0 +1,3 @@ +(executable + (name foo) + (package foo)) diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name/dune-project b/test/blackbox-tests/test-cases/github992/package-without-pub-name/dune-project new file mode 100644 index 00000000..de4fc209 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/package-without-pub-name/dune-project @@ -0,0 +1 @@ +(lang dune 1.0) diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name/foo.ml b/test/blackbox-tests/test-cases/github992/package-without-pub-name/foo.ml new file mode 100644 index 00000000..2ddf2486 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/package-without-pub-name/foo.ml @@ -0,0 +1 @@ +print_endline "Hello, world!" diff --git a/test/blackbox-tests/test-cases/github992/package-without-pub-name/foo.opam b/test/blackbox-tests/test-cases/github992/package-without-pub-name/foo.opam new file mode 100644 index 00000000..e69de29b diff --git a/test/blackbox-tests/test-cases/github992/run.t b/test/blackbox-tests/test-cases/github992/run.t new file mode 100644 index 00000000..46553778 --- /dev/null +++ b/test/blackbox-tests/test-cases/github992/run.t @@ -0,0 +1,24 @@ +Variaous regression tests fixed by ocaml/dune#992 + +Interaction of (menhir ...) and -p +---------------------------------- + +This used to fail because dune couldn't associate a compilation +context to the menhir files when package bar was hidden. + + $ cd menhir-and-dash-p && dune build -p foo + +package field without public_name field +--------------------------------------- + +This used to fail because the parser for the "package" field when +there is no "public_name"/"public_names" field used to not parse the +argument of "package". + + $ cd package-without-pub-name && dune build -p foo + File "dune", line 3, characters 1-14: + Warning: This field is useless without a (public_name ...) field. + + $ cd package-without-pub-name-jbuild && dune build -p foo + File "jbuild", line 3, characters 2-15: + Warning: This field is useless without a (public_name ...) field. diff --git a/test/blackbox-tests/test-cases/too-many-parens/run.t b/test/blackbox-tests/test-cases/too-many-parens/run.t index 637fae19..a9d7977c 100644 --- a/test/blackbox-tests/test-cases/too-many-parens/run.t +++ b/test/blackbox-tests/test-cases/too-many-parens/run.t @@ -10,3 +10,8 @@ are readable. File "dune", line 4, characters 12-17: These parentheses are no longer necessary with dune, please remove them. [1] + + $ dune build --root c + File "dune", line 3, characters 7-14: + These parentheses are no longer necessary with dune, please remove them. + [1]