Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Simplify adding a rule that use a diff action #3795

Merged
merged 4 commits into from
Sep 30, 2020
Merged

Simplify adding a rule that use a diff action #3795

merged 4 commits into from
Sep 30, 2020

Conversation

bobot
Copy link
Collaborator

@bobot bobot commented Sep 16, 2020 •
edited
Loading

When adding tests that use the diff action, it is inconvenient that you need to create an empty file for the reference. Otherwise the rule can't be executed since the reference is not available.

This MR fix the first part, the rule can be executed and the diffing is done against the empty file /dev/null or NUL. The heuristic for promotion is modified by also doing a promotion if it is not a target, which at this point is equivalent with the file is not present in the build directory.

@bobot bobot force-pushed the diffing_with_non_existent_reference branch from b89ea9c to ed9749d Compare September 16, 2020 16:25
@bobot bobot changed the title [WIP] Simplify adding a rule that use a diff action Simplify adding a rule that use a diff action Sep 16, 2020
@bobot bobot changed the title Simplify adding a rule that use a diff action [WIP] Simplify adding a rule that use a diff action Sep 16, 2020
@bobot
Copy link
Collaborator Author

bobot commented Sep 16, 2020 •
edited
Loading

There is one remaining todo because there is no dynamic version of Build.file_exists. Currently if this source file is expanded later it becomes a pure dynamic dependency.

Should I try to add that in this MR?

@bobot bobot force-pushed the diffing_with_non_existent_reference branch 2 times, most recently from 835f55a to e58e49f Compare September 16, 2020 19:46
@bobot
Copy link
Collaborator Author

bobot commented Sep 17, 2020

The todo is removed by adding val Build.filter_existing_files : ('a * Path.Set.t) t -> ('a * Path.Set.t) t. Other API extension would have been possible such as val Build.dyn_deps : ?only_existing:bool -> ('a * Dep.Set.t) t -> 'a t.

@bobot bobot force-pushed the diffing_with_non_existent_reference branch from e58e49f to 0146419 Compare September 17, 2020 09:16
@rgrinberg
Copy link
Member

Is this still WIP? It seems ready to me. Could you create a separate test file for this with a proper description. E.g:

ls promote/
  old-tests.t
  non-existent.t

I realize the old tests aren't well organized, but new tests should be easy to read.

@snowleopard could we get your review here?

@bobot bobot changed the title [WIP] Simplify adding a rule that use a diff action Simplify adding a rule that use a diff action Sep 25, 2020
@bobot bobot force-pushed the diffing_with_non_existent_reference branch from 0146419 to 367814f Compare September 25, 2020 07:49
@bobot
Copy link
Collaborator Author

bobot commented Sep 25, 2020

Indeed it was not WIP anymore. Good idea to separate the tests.

@bobot bobot force-pushed the diffing_with_non_existent_reference branch from 367814f to 791f4f7 Compare September 25, 2020 07:51
snowleopard
snowleopard approved these changes Sep 29, 2020
View reviewed changes
Copy link
Collaborator

@snowleopard snowleopard left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @bobot! It's an interesting new Build combinator, which I guess might develop further in future.

I reviewed the code related to build.ml. It looks OK, but see a couple of suggestions regarding comments.

I don't really know much about action_unexpanded.ml and friends, but my understanding is that @rgrinberg had already looked at that part.

@bobot bobot force-pushed the diffing_with_non_existent_reference branch from e048edd to 8b979ae Compare September 30, 2020 07:52
@bobot bobot merged commit ca27dd6 into ocaml:master Sep 30, 2020
@rgrinberg
Copy link
Member

@bobot could you push a commit to master that updates CHANGES?

@rgrinberg rgrinberg mentioned this pull request Jan 13, 2021
Merged
rgrinberg added a commit to rgrinberg/opam-repository that referenced this pull request Jan 13, 2021
@rgrinberg
[new release] dune-build-info, dune, dune-configurator, dune-site, du…
dbe0014 
…ne-action-plugin, dune-private-libs and dune-glob (2.8.0)

CHANGES:

- `dune rules` accepts aliases and other non-path rules (ocaml/dune#4063, @mrmr1993)

- Action `(diff reference test_result)` now accept `reference` to be absent and
  in that case consider that the reference is empty. Then running `dune promote`
  will create the reference file. (ocaml/dune#3795, @bobot)

- Ignore special files (BLK, CHR, FIFO, SOCKET), (ocaml/dune#3570, fixes ocaml/dune#3124, ocaml/dune#3546,
  @ejgallego)

- Experimental: Simplify loading of additional files (data or code) at runtime
  in programs by introducing specific installation sites. In particular it allow
  to define plugins to be installed in these sites. (ocaml/dune#3104, ocaml/dune#3794, fixes ocaml/dune#1185,
  @bobot)

- Move all temporary files created by dune to run actions to a single directory
  and make sure that actions executed by dune also use this directory by setting
  `TMPDIR` (or `TEMP` on Windows). (ocaml/dune#3691, fixes ocaml/dune#3422, @rgrinberg)

- Fix bootstrap script with custom configuration. (ocaml/dune#3757, fixes ocaml/dune#3774, @marsam)

- Add the `executable` field to `inline_tests` to customize the compilation
  flags of the test runner executable (ocaml/dune#3747, fixes ocaml/dune#3679, @lubegasimon)

- Add `(enabled_if ...)` to `(copy_files ...)` (ocaml/dune#3756, @nojb)

- Make sure Dune cleans up the status line before exiting (ocaml/dune#3767,
  fixes ocaml/dune#3737, @alan-j-hu)

- Add `{gitlab,bitbucket}` as options for defining project sources with `source`
  stanza `(source (<host> user/repo))` in the `dune-project` file.  (ocaml/dune#3813,
  @rgrinberg)

- Fix generation of `META` and `dune-package` files when some targets (byte,
  native, dynlink) are disabled. Previously, dune would generate all archives
  for regardless of settings. (ocaml/dune#3829, ocaml/dune#4041, @rgrinberg)

- Do not run ocamldep to for single module executables & libraries. The
  dependency graph for such artifacts is trivial (ocaml/dune#3847, @rgrinberg)

- Fix cram tests inside vendored directories not being interpreted correctly.
  (ocaml/dune#3860, fixes ocaml/dune#3843, @rgrinberg)

- Add `package` field to private libraries. This allows such libraries to be
  installed and to be usable by other public libraries in the same project
  (ocaml/dune#3655, fixes ocaml/dune#1017, @rgrinberg)

- Fix the `%{make}` variable on Windows by only checking for a `gmake` binary
  on UNIX-like systems as a unrelated `gmake` binary might exist on Windows.
  (ocaml/dune#3853, @kit-ty-kate)

- Fix `$ dune install` modifying the build directory. This made the build
  directory unusable when `$ sudo dune install` modified permissions. (fix
  ocaml/dune#3857, @rgrinberg)

- Fix handling of aliases given on the command line (using the `@` and `@@`
  syntax) so as to correctly handle relative paths. (ocaml/dune#3874, fixes ocaml/dune#3850, @nojb)

- Allow link time code generation to be used in preprocessing executable. This
  makes it possible to use the build info module inside the preprocessor.
  (ocaml/dune#3848, fix ocaml/dune#3848, @rgrinberg)

- Correctly call `git ls-tree` so unicode files are not quoted, this fixes
  problems with `dune subst` in the presence of unicode files. Fixes ocaml/dune#3219
  (ocaml/dune#3879, @ejgallego)

- `dune subst` now accepts common command-line arguments such as
  `--debug-backtraces` (ocaml/dune#3878, @ejgallego)

- `dune describe` now also includes information about executables in addition to
  that of libraries. (ocaml/dune#3892, ocaml/dune#3895, @nojb)

- instrumentation backends can now receive arguments via `(instrumentation
  (backend <name> <args>))`. (ocaml/dune#3906, ocaml/dune#3932, @nojb)

- Tweak auto-formatting of `dune` files to improve readability. (ocaml/dune#3928, @nojb)

- Add a switch argument to opam when context is not default. (ocaml/dune#3951, @tmattio)

- Avoid pager when running `$ git diff` (ocaml/dune#3912, @AltGr)

- Add `(root_module ..)` field to libraries & executables. This makes it
  possible to use library dependencies shadowed by local modules (ocaml/dune#3825,
  @rgrinberg)

- Allow `(formatting ...)` field in `(env ...)` stanza to set per-directory
  formatting specification. (ocaml/dune#3942, @nojb)

- [coq] In `coq.theory`, `:standard` for the `flags` field now uses the
  flags set in `env` profile flags (ocaml/dune#3931 , @ejgallego @rgrinberg)

- [coq] Add `-q` flag to `:standard` `coqc` flags , fixes ocaml/dune#3924, (ocaml/dune#3931 , @ejgallego)

- Add support for Coq's native compute compilation mode (@ejgallego, ocaml/dune#3210)

- Add a `SUFFIX` directive in `.merlin` files for each dialect with no
  preprocessing, to let merlin know of additional file extensions (ocaml/dune#3977,
  @vouillon)

- Stop promoting `.merlin` files. Write per-stanza Merlin configurations in
  binary form. Add a new subcommand `dune ocaml-merlin` that Merlin can use to
  query the configuration files. The `allow_approximate_merlin` option is now
  useless and deprecated. Dune now conflicts with `merlin < 3.4.0` and
  `ocaml-lsp-server < 1.3.0` (ocaml/dune#3554, @voodoos)

- Configurator: fix a bug introduced in 2.6.0 where the configurator V1 API
  doesn't work at all when used outside of dune. (ocaml/dune#4046, @aalekseyev)

- Fix `libexec` and `libexec-private` variables. In cross-compilation settings,
  they now point to the file in the host context. (ocaml/dune#4058, fixes ocaml/dune#4057,
  @TheLortex)

- When running `$ dune subst`, use project metadata as a fallback when package
  metadata is missing. We also generate a warning when `(name ..)` is missing in
  `dune-project` files to avoid failures in production builds.

- Remove support for passing `-nodynlink` for executables. It was bypassed in
  most cases and not correct in other cases in particular on arm32.
  (ocaml/dune#4085, fixes ocaml/dune#4069, fixes ocaml/dune#2527, @emillon)

- Generate archive rules compatible with 4.12. Dune longer attempt to generate
  an archive file if it's unnecessary (ocaml/dune#3973, fixes ocaml/dune#3766, @rgrinberg)

- Fix generated Merlin configurations when multiple preprocessors are defined
  for different modules in the same folder. (ocaml/dune#4092, fixes ocaml/dune#2596, ocaml/dune#1212 and
  ocaml/dune#3409, @voodoos)

- Add the option `use_standard_c_and_cxx_flags` to `dune-project` that 1.
  disables the unconditional use of the `ocamlc_cflags` and `ocamlc_cppflags`
  from `ocamlc -config` in C compiler calls, these flags will be present in the
  `:standard` set instead; and 2. enables the detection of the C compiler family
  and populates the `:standard` set of flags with common default values when
  building CXX stubs. (ocaml/dune#3875, ocaml/dune#3802, fix ocaml/dune#3718 and ocaml/dune#3528, @voodoos)
@bobot bobot mentioned this pull request Feb 1, 2021
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@snowleopard snowleopard snowleopard approved these changes

@emillon emillon Awaiting requested review from emillon

@nojb nojb Awaiting requested review from nojb

@rgrinberg rgrinberg Awaiting requested review from rgrinberg

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bobot @rgrinberg @snowleopard