diff --git a/doc/changes/fixed/13522.md b/doc/changes/fixed/13522.md new file mode 100644 index 00000000000..4ad545e575e --- /dev/null +++ b/doc/changes/fixed/13522.md @@ -0,0 +1,2 @@ +- Fix `melange.emit` not respecting the package mask via `-p ` (#13522, + @anmonteiro) diff --git a/src/dune_rules/stanzas/stanzas.ml b/src/dune_rules/stanzas/stanzas.ml index dd80f714604..b4c48ea37f9 100644 --- a/src/dune_rules/stanzas/stanzas.ml +++ b/src/dune_rules/stanzas/stanzas.ml @@ -135,6 +135,7 @@ let stanza_package stanza = | Tests.T { package = Some package; _ } -> Some package | Coq_stanza.Theory.T { package = Some package; _ } -> Some package | Rocq_stanza.Theory.T { package = Some package; _ } -> Some package + | Melange_stanzas.Emit.T { package = Some package; _ } -> Some package | _ -> None) |> Option.map ~f:Package.id with diff --git a/test/blackbox-tests/test-cases/melange/melange-emit-package.t b/test/blackbox-tests/test-cases/melange/melange-emit-package.t index c4e58ecbc10..e728d85a393 100644 --- a/test/blackbox-tests/test-cases/melange/melange-emit-package.t +++ b/test/blackbox-tests/test-cases/melange/melange-emit-package.t @@ -79,14 +79,11 @@ we can still build my-ppx independently $ dune build -p my-ppx -and fails if it can't resolve libraries to build the alias +and fails to build any `@melange`-related stuff, because none is defined for +the package `my-ppx` $ dune build @melange -p my-ppx - File "test/dune", line 6, characters 12-19: - 6 | (libraries mel-foo)) - ^^^^^^^ - Error: Library "mel-foo" not found. - -> required by _build/default/test/js-out/test/test_entry.js - -> required by alias test/melange + Error: Alias "melange" specified on the command line is empty. + It is not defined in . or any of its descendants. [1] diff --git a/test/blackbox-tests/test-cases/melange/melange-runtest-multiple-packages.t b/test/blackbox-tests/test-cases/melange/melange-runtest-multiple-packages.t index b2281d51ccb..86c8cf3036d 100644 --- a/test/blackbox-tests/test-cases/melange/melange-runtest-multiple-packages.t +++ b/test/blackbox-tests/test-cases/melange/melange-runtest-multiple-packages.t @@ -33,9 +33,8 @@ Show interaction of `dune runtest -p ..` and `(melange.emit ..)` Selecting only the package a should not build b $ dune runtest -p a - $ ls _build/default/b/out/b - x.js + $ test -e _build/default/b/out/b/x.js + [1] $ dune runtest -p b - $ ls _build/default/b/out/b - x.js + $ test -e _build/default/b/out/b/x.js