Skip to content

Commit

Permalink
Merge branch 'main' into ps/branch/feature__allow_arch_sixtyfour_in_e…
Browse files Browse the repository at this point in the history
…nabled_if
  • Loading branch information
Alizter authored Jul 20, 2023
2 parents f769b5e + 92d8848 commit 979a6e3
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 2 deletions.
13 changes: 13 additions & 0 deletions doc/hacking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,19 @@ For integration tests, we use a system similar to `Cram tests
.. _ppx_expect: https://github.com/janestreet/ppx_expect
When running dune inside tests, the ``INSIDE_DUNE`` environment variable is set.
This has the following effects:
* Change the default root detection behaviour to use the current directory
rather than the top most ``dune-project`` / ``dune-workspace`` file.
* Be less verbose when Dune outputs a user message.
* Error reporting is deterministic by default.
* Prefer not to use a diff program for displaying diffs.
This list is not exhaustive and may change in the future. In order to find the
exact behaviour, it is recommended to search for ``INSIDE_DUNE`` in the
codebase.
Guidelines
----------
Expand Down
15 changes: 13 additions & 2 deletions test/blackbox-tests/test-cases/github8041.t
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
$ cat > dune-project << EOF
> (lang dune 1.0)
> (lang dune 2.4)
> (package
> (name p))
> EOF

$ cat > dune << EOF
> (rule (copy data.txt data2.txt))
>
> (install
> (files data.txt)
> (files data.txt data2.txt)
> (section share))
> EOF

Expand All @@ -15,3 +17,12 @@
If sendfile fails, we should fallback to the portable implementation.

$ strace -e inject=sendfile:error=EINVAL -o /dev/null dune build @install
Error: _build/default/data2.txt: Permission denied
-> required by _build/default/data2.txt
-> required by _build/install/default/share/p/data2.txt
-> required by _build/default/p.install
-> required by alias install
[1]

#8210: data2.txt is copied from readonly-file data.txt (#3092), so it needs to
be adequately unlinked before starting the fallback.

0 comments on commit 979a6e3

Please sign in to comment.