Allow running tests concurrently with watch server, again! #12473

ElectreAAS · 2025-09-17T17:41:48Z

Contributed to #8114
Supersedes #11900.

This PR is a 'remake' of Steve's: I rebased it on main, and applied what I learned making #12010 and #12064. This results in significant changes from the original, hence the new PR.

The 'runtest' RPC request is now public, in otherlibs. runtest_rpc.ml{i} was removed.

The behaviour is now (AFAI know what I'm doing) identical between running dune runtest [ARGUMENTS] with or without the RPC server.

See comments below for details

test/blackbox-tests/test-cases/cram/custom-build-dir.t

ElectreAAS · 2025-09-17T17:50:51Z

Notes from rebasing: Since the contents of bin/runtest.ml have been largely moved to bin/runtest_common.ml, it'd be easy to accidentaly overwrite changes made to the former since the original PR.
#11869 and #12251 are PRs that fit that description, and have been correctly applied to runtest_common

test/blackbox-tests/test-cases/cram/custom-build-dir.t

ElectreAAS · 2025-10-03T10:47:54Z

Outdated

The last commit (27412bc) is maybe a bit overzealous in the refactoring, but that was the only way I found to make sure the error messages were correct.
Review can be done without it, and if deemed necessary I could put it in a different PR

Up to date

I just force-pushed a few changes:

it's now rebased on main
there are now only 2 commits:
- the first is the one that has only what is necessary for the feature, without previous refactorings
- the second has all the plumbing required to make the 'forwarding' warning appear at the correct time (after actually connecting to the RPC server)

It's now both ready to review and reviewable! 😃

PS: the previous state of this PR is still visible on my fork, as a backup

test/blackbox-tests/test-cases/watching/watching-eager-concurrent-build-command.t

Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>

* Allow running tests concurrently with watch server * Fix 'forwarding' warning appearing too early --------- Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>

@ElectreAAS

Before this change, it was producing the category subheadings at the wrong level (level 2), instead of level 3. An example of the corrected changelog produced: ``` 3.21.0 (2025-12-08) -------------------- ### Fixed - Fix `include_subdirs qualified` incorrectly picking the furthest module instead of the closest when resolving module name ambiguities. (#12587, @ElectreAAS and @Alizter) - Fix: include the module alias in the transitive dependency closure with `(include_subdirs qualified)`. (#12299, @anmonteiro) - Pass private modules with -H when this is available (#12666, @rgrinberg) - Allow multiple modules in `(modules_flags ...)`, in `coq.theory` (#12733, @rlepigre) - Improve error message for invalid version formats in both `(lang dune ...)` and `(using extension ...)` declarations. Changes "Atom of the form NNN.NNN expected" to "Invalid version. Version must be two numbers separated by a dot." (#12833, @benodiwal) - Fix crash when running `dune build @check` on a library with virtual modules. (#12644, fixes #12636, @Alizter) - Provide a more informative error message when `(pkg enabled)` is put in `dune-project` instead of `dune-workspace`. (#12802, fixes #12801, @benodiwal) - Improve error message when invalid version strings are used in `dune-project` files. Non-ASCII characters and malformed versions now show a helpful hint with an example of the correct format. (#12794, fixes #12751, @benodiwal) - Stop hiding the `root_module` from the include path (#12239, @rgrinberg) - Allow `$ dune init` to work on absolute paths (#12601, fixes #7806, @rgrinberg) - `(include_subdirs qualified)`: Add missing alias dependency to module group. (#12530, @anmonteiro) - Add Melange compilation to the `@all` alias in libraries (#12628, @anmonteiro) - melange support: don't emit empty JavaScript modules for generated module aliases. (#12464, @anmonteiro) ### Added - (Experimental): Introduce the `library_parameter` stanza. It allows users to declare a parameter when using the OxCaml compiler. (#11963, implements #12084, @maiste) - Added the ability to scroll horizontally in TUI. (#12386, @Alizter) - Feature: Include shell command that was executed when a cram test has occurred in the error message (#12307, @rgrinberg) - Add support for `%{cmt:...}` and `%{cmti:...}` variables to reference compiled annotation files (.cmt and .cmti) containing typed abstract syntax trees with location and type information. (#12634, grants #12633, @Alizter) - Add `$ dune describe tests` to describe the tests in the workspace (@Gromototo, #12545, fixes #12030) - Allow `dune runtest` to properly run while a watch mode server is running. (#12473, grants #8114, @gridbugs and @ElectreAAS) - Use copy-on-write (COW) when copying files on filesystems that support it (Btrfs, ZFS, XFS, etc), under Linux. (#12074, fixes #12071, @nojb) - Add support for Tangled ATproto-based code repositories (#12197, @avsm) - Add support for instantiating OxCaml parameterised libraries. (#12561, @art-w) ``` Note that the `Fixed` and `Added` headers are at level 3. Compare with the previous, incorrect logic, produced initially in the current release branch: https://github.com/shonfeder/dune/blob/c5af78ff322225de3e839982600a1180caa951bf/CHANGES.md?plain=1 This incorrect formatting caused the documented release process to produce release with no changelog (e.g., https://github.com/ocaml/dune/releases/tag/3.21.0_alpha0) Signed-off-by: Shon Feder <shon.feder@gmail.com>

@ElectreAAS

CHANGES: ### Fixed - Fix `include_subdirs qualified` incorrectly picking the furthest module instead of the closest when resolving module name ambiguities. (ocaml/dune#12587, @ElectreAAS and @Alizter) - Fix: include the module alias in the transitive dependency closure with `(include_subdirs qualified)`. (ocaml/dune#12299, @anmonteiro) - Improve error messages for invalid version formats containing non-ASCII characters. Previously, non-ASCII characters in version strings (e.g., `(lang dune è)` or `(using menhir π3.14)`) would fail with a generic "Invalid file" error. Now they display a clear message: "Invalid atom: contains non-ASCII character(s). Atoms must only contain ASCII characters." The fix is implemented at the lexer level, providing consistent error handling across all s-expression parsing. (ocaml/dune#12844, fixes ocaml/dune#12836, @benodiwal) - Pass private modules with -H when this is available (ocaml/dune#12666, @rgrinberg) - Allow multiple modules in `(modules_flags ...)`, in `coq.theory` (ocaml/dune#12733, @rlepigre) - Improve error message for invalid version formats in both `(lang dune ...)` and `(using extension ...)` declarations. Changes "Atom of the form NNN.NNN expected" to "Invalid version. Version must be two numbers separated by a dot." (ocaml/dune#12833, @benodiwal) - Fix crash when running `dune build @check` on a library with virtual modules. (ocaml/dune#12644, fixes ocaml/dune#12636, @Alizter) - Provide a more informative error message when `(pkg enabled)` is put in `dune-project` instead of `dune-workspace`. (ocaml/dune#12802, fixes ocaml/dune#12801, @benodiwal) - Improve error message when invalid version strings are used in `dune-project` files. Non-ASCII characters and malformed versions now show a helpful hint with an example of the correct format. (ocaml/dune#12794, fixes ocaml/dune#12751, @benodiwal) - Stop hiding the `root_module` from the include path (ocaml/dune#12239, @rgrinberg) - Allow `$ dune init` to work on absolute paths (ocaml/dune#12601, fixes ocaml/dune#7806, @rgrinberg) - `(include_subdirs qualified)`: Add missing alias dependency to module group. (ocaml/dune#12530, @anmonteiro) - Add Melange compilation to the `@all` alias in libraries (ocaml/dune#12628, @anmonteiro) - Fix greedy version location in lang declarations. Previously, error locations for invalid lang versions would span multiple bytes for multi-byte UTF-8 characters, causing carets to appear misaligned and seemingly include the closing parenthesis. Now, error locations for ASCII strings show the full length (e.g., "Ali" shows `^^^`), while non-ASCII strings show only the first byte (e.g., "è" shows `^`) to avoid multi-byte character display issues. (ocaml/dune#12869, fixes ocaml/dune#12806, @benodiwal) - melange support: don't emit empty JavaScript modules for generated module aliases. (ocaml/dune#12464, @anmonteiro) ### Added - (Experimental): Introduce the `library_parameter` stanza. It allows users to declare a parameter when using the OxCaml compiler. (ocaml/dune#11963, implements ocaml/dune#12084, @maiste) - Added the ability to scroll horizontally in TUI. (ocaml/dune#12386, @Alizter) - Feature: Include shell command that was executed when a cram test has occurred in the error message (ocaml/dune#12307, @rgrinberg) - support expanding variables in `(promote (into ..))` (ocaml/dune#12832, fixes ocaml/dune#12742, @anmonteiro) - Add support for `%{cmt:...}` and `%{cmti:...}` variables to reference compiled annotation files (.cmt and .cmti) containing typed abstract syntax trees with location and type information. (ocaml/dune#12634, grants ocaml/dune#12633, @Alizter) - Add `$ dune describe tests` to describe the tests in the workspace (@Gromototo, ocaml/dune#12545, fixes ocaml/dune#12030) - Add `argv`, the process environment, and the dune version to the config event in the trace (ocaml/dune#12909, @rgrinberg) - Allow `dune runtest` to properly run while a watch mode server is running. (ocaml/dune#12473, grants ocaml/dune#8114, @gridbugs and @ElectreAAS) - Use copy-on-write (COW) when copying files on filesystems that support it (Btrfs, ZFS, XFS, etc), under Linux. (ocaml/dune#12074, fixes ocaml/dune#12071, @nojb) - Add support for Tangled ATproto-based code repositories (ocaml/dune#12197, @avsm) - Add support for instantiating OxCaml parameterised libraries. (ocaml/dune#12561, @art-w) - Add a `(conflict_markers error|ignore)` option to the cram stanza. When `(conflict_markers error)` is set, the cram test will fail in the presence of conflict markers. Git, diff3 and jujutsu conflict markers are detected. (ocaml/dune#12538, ocaml/dune#12617, ocaml/dune#12655, fixes ocaml/dune#12512, @rgrinberg, @Alizter) - Introduce a `%{ppx:lib1+..+libn}` stanza to make it possible to refer to ppx executables built by dune. This is useful for writing tests (ocaml/dune#12711, @rgrinberg) - Introduce a `(dir ..)` field on packages defined in the `dune-project`. This field allows to associate a directory with a particular package. This makes dune automatically filter out all stanzas in this directory and its descendants with `--only-packages`. All users are recommended to switch to using this field. (ocaml/dune#12614, fixes ocaml/dune#3255, @rgrinberg) - Add support for `DUNE_ROOT` environment variable, similar to the existing `--root` CLI parameter. (fixes ocaml/dune#12399 @sir4ur0n) - Introduce an `unused-libs` alias to detect unused libraries. (ocaml/dune#12623, fixes ocaml/dune#650, @rgrinberg) - Add `--files` flag to `dune describe opam-files` to print only the names of the opam files line by line. (ocaml/dune#9793, @reynir and @Alizter) - `dune exec` now accepts absolute paths inside the workspace. (ocaml/dune#12094, @Alizter) - Add `coqdoc_header` and `coqdoc_footer` fields to the `coq` field of the `env` stanza, and to the `coq.theory` stanza, allowing to configure a custom header or footer respectively in the HTML output of `coqdoc`. (ocaml/dune#11131, @rlepigre) - Allow `dune fmt` to properly run while a watch mode server is running. Note that the `--preview` flag is not supported in this mode. (ocaml/dune#12064, @ElectreAAS) - Support for generating `_CoqProject` files for `coq.theory` stanzas. (ocaml/dune#11752, @rlepigre) - Added `(files)` stanza, similar to `(dirs)` to control which files are visible to Dune on a per-directory basis. (ocaml/dune#12879, @nojb) - Add support for %{ocaml-config:ox} (ocaml/dune#12236, @jonludlam) - Introduce `dune promotion show` command to display the contents of corrected files that are ready for promotion. This allows users to preview changes before running `dune promote`. The command accepts file arguments to show specific files, or displays all promotable files when called without arguments. (ocaml/dune#12669, fixes ocaml/dune#3883, @MixiMaxiMouse) - New `(lang rocq)` build mode for Rocq 9.0 and later. This new mode is very similar to the existing `(lang coq)`, except that it doesn't need the `coq*` compatibility wrappers. As of today `(lang rocq)` doesn't support yet composed builds with Rocq itself, this will be added later. `(lang coq)` is deprecated, development is frozen, and will be removed at some point in the future. (ocaml/dune#12035, @ejgallego, @Lysxia, fixes ocaml/dune#11572) ### Changed - Don't run `ocamldep` to compute false dependencies on the `root_module` (ocaml/dune#12227, @rgrinberg) - `dune format-dune-file` now uses the syntax version of the Dune project that contains the file being formatted (if any) instead of using the latest version available, which remains the default if there is no Dune project in scope. (ocaml/dune#11865, @nojb) - Persistent DB and process events have been slightly modified. Persistent DB events have more concise names and job events always include full information. (ocaml/dune#12867, @rgrinberg) - Removed the `--trace-extended` flag. Its functionality is always enabled when tracing is active (ocaml/dune#12908, @rgrinberg) - The `test/dune` file generated by `dune init proj` now depends on the project library. (ocaml/dune#12791, @shonfeder) - Starting with version 3.21 of the Dune language, Dune no longer changes the default set of compiler warnings. For users that would like to keep the old behaviour, the variable `%{dune-warnings}` can be used in an `(env)` stanza in a top-level Dune file: `(env (dev (flags :standard %{dune-warnings})))`. (ocaml/dune#12766, @nojb) - Fix: stop generating `cmt` files for cinaps binaries (ocaml/dune#12530, @rgrinberg)

ElectreAAS commented Sep 17, 2025

View reviewed changes

test/blackbox-tests/test-cases/cram/custom-build-dir.t Outdated Show resolved Hide resolved

ElectreAAS force-pushed the test-concurrent-with-watch-mode branch from fec9cf9 to f20ddb3 Compare September 17, 2025 17:47

ElectreAAS requested a review from Alizter September 17, 2025 17:51

ElectreAAS force-pushed the test-concurrent-with-watch-mode branch from 009a1ff to ccc3909 Compare September 30, 2025 09:54

ElectreAAS commented Sep 30, 2025

View reviewed changes

test/blackbox-tests/test-cases/cram/custom-build-dir.t Show resolved Hide resolved

ElectreAAS force-pushed the test-concurrent-with-watch-mode branch from c4ba736 to 27412bc Compare October 2, 2025 18:37

Alizter self-assigned this Oct 3, 2025

shonfeder mentioned this pull request Oct 3, 2025

Allow concurrent exec with watch mode #11840

Merged

ElectreAAS force-pushed the test-concurrent-with-watch-mode branch from 27412bc to 7d000a2 Compare October 7, 2025 10:17

shonfeder requested a review from gridbugs October 7, 2025 22:12

Alizter reviewed Oct 13, 2025

View reviewed changes

test/blackbox-tests/test-cases/watching/watching-eager-concurrent-build-command.t Outdated Show resolved Hide resolved

ElectreAAS force-pushed the test-concurrent-with-watch-mode branch from 7d000a2 to 6cb1657 Compare October 13, 2025 16:13

Alizter approved these changes Oct 13, 2025

View reviewed changes

Alizter requested a review from rgrinberg October 13, 2025 19:29

ElectreAAS added 2 commits October 13, 2025 21:30

Allow running tests concurrently with watch server

2921588

Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>

Fix 'forwarding' warning appearing too early

4a28f9c

Signed-off-by: Ambre Austen Suhamy <ambre@tarides.com>

Alizter force-pushed the test-concurrent-with-watch-mode branch from 6cb1657 to 4a28f9c Compare October 13, 2025 19:30

Merge branch 'main' into test-concurrent-with-watch-mode

6803c5e

ElectreAAS merged commit 7861fb5 into ocaml:main Oct 14, 2025
11 of 12 checks passed

ElectreAAS deleted the test-concurrent-with-watch-mode branch October 14, 2025 09:54

shonfeder mentioned this pull request Dec 11, 2025

[new release] dune (17 packages) (3.21.0~alpha3) ocaml/opam-repository#29070

Closed

shonfeder mentioned this pull request Dec 15, 2025

[new release] dune (17 packages) (3.21.0~alpha4) ocaml/opam-repository#29096

Draft

yakobowski mentioned this pull request Dec 28, 2025

dune build --watch + dune exec + DUNE_BUILD_DIR does not work #13080

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Allow running tests concurrently with watch server, again! #12473

Allow running tests concurrently with watch server, again! #12473

Uh oh!

ElectreAAS commented Sep 17, 2025 •

edited by shonfeder

Loading

Uh oh!

Uh oh!

ElectreAAS commented Sep 17, 2025

Uh oh!

Uh oh!

ElectreAAS commented Oct 3, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Allow running tests concurrently with watch server, again! #12473

Allow running tests concurrently with watch server, again! #12473

Uh oh!

Conversation

ElectreAAS commented Sep 17, 2025 • edited by shonfeder Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

ElectreAAS commented Sep 17, 2025

Uh oh!

Uh oh!

ElectreAAS commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Outdated

Up to date

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

ElectreAAS commented Sep 17, 2025 •

edited by shonfeder

Loading

ElectreAAS commented Oct 3, 2025 •

edited

Loading