diff --git a/CHANGES.md b/CHANGES.md index 590158b1794..6cb90e551f6 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,9 @@ Unreleased 0.7. `(mode native)` has been deprecated in favour of detection from the configuration of Coq. (#6409, @Alizter) +- Print "Leaving Directory" whenever "Entering Directory" is printed. (#6149, + fixes #138, @cpitclaudel, @rgrinberg) + 3.6.0 (2022-11-14) ------------------ @@ -3065,7 +3068,7 @@ Unreleased - Print `Entering directory '...'` when the workspace root is not the current directory. This allows Emacs and Vim to know where relative - filenames should be interpreted from. Fixes #138 + filenames should be interpreted from. (fixes #138, @jeremiedimino) - Fix a bug related to `menhir` stanzas: `menhir` stanzas with a `merge_into` field that were in `jbuild` files in sub-directories diff --git a/bin/common.ml b/bin/common.ml index a8a2bf8206d..a671ad1394c 100644 --- a/bin/common.ml +++ b/bin/common.ml @@ -118,7 +118,7 @@ let normalize_path path = let print_entering_message c = let cwd = Path.to_absolute_filename Path.root in - if cwd <> Fpath.initial_cwd && not c.no_print_directory then + if cwd <> Fpath.initial_cwd && not c.no_print_directory then ( (* Editors such as Emacs parse the output of the build system and interpret filenames in error messages relative to where the build system was started. @@ -151,7 +151,10 @@ let print_entering_message c = in loop ".." (Filename.dirname s))) in - Console.print [ Pp.verbatim (sprintf "Entering directory '%s'" dir) ] + Console.print [ Pp.verbatim (sprintf "Entering directory '%s'" dir) ]; + at_exit (fun () -> + flush stdout; + Console.print [ Pp.verbatim (sprintf "Leaving directory '%s'" dir) ])) let init ?log_file c = if c.root.dir <> Filename.current_dir_name then Sys.chdir c.root.dir; diff --git a/otherlibs/site/test/run.t b/otherlibs/site/test/run.t index 4eb0de026f7..12072fa8b71 100644 --- a/otherlibs/site/test/run.t +++ b/otherlibs/site/test/run.t @@ -335,9 +335,11 @@ Test compiling an external plugin $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH dune build --root=e Entering directory 'e' + Leaving directory 'e' $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH PATH=$(pwd)/_install/bin:$PATH dune exec --root=e -- c Entering directory 'e' + Leaving directory 'e' run a a: $TESTCASE_ROOT/_install/share/a/data run c: a linked registered:. @@ -354,6 +356,7 @@ Test compiling an external plugin $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH dune install --root=e --prefix $(pwd)/_install 2>&1 | sed -e "/^Installing/d" Entering directory 'e' + Leaving directory 'e' $ OCAMLPATH=_install/lib:$OCAMLPATH _install/bin/c run a @@ -411,6 +414,7 @@ Test %{version:installed-pkg} $ OCAMLPATH=_install/lib:$OCAMLPATH dune build --root=f Entering directory 'f' + Leaving directory 'f' $ cat $(pwd)/f/_build/default/test.target a = 0.a e = @@ -423,6 +427,7 @@ Test %{version:installed-pkg} ^^^^^^^^^^^^^^^^^ Error: Library names are not allowed in this position. Only package names are allowed + Leaving directory 'f' [1] $ rm f/dune diff --git a/otherlibs/site/test/run_2_9.t b/otherlibs/site/test/run_2_9.t index 2410ec00b80..f41549ecffa 100644 --- a/otherlibs/site/test/run_2_9.t +++ b/otherlibs/site/test/run_2_9.t @@ -320,9 +320,11 @@ Test compiling an external plugin $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH dune build --root=e Entering directory 'e' + Leaving directory 'e' $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH PATH=$(pwd)/_install/bin:$PATH dune exec --root=e -- c Entering directory 'e' + Leaving directory 'e' run a a: $TESTCASE_ROOT/_install/share/a/data run c: a linked registered:. @@ -395,6 +397,7 @@ Test %{version:installed-pkg} $ OCAMLPATH=_install/lib:$OCAMLPATH dune build --root=f Entering directory 'f' + Leaving directory 'f' $ cat $(pwd)/f/_build/default/test.target a = 0.a e = @@ -407,6 +410,7 @@ Test %{version:installed-pkg} ^^^^^^^^^^^^^^^^^ Error: Library names are not allowed in this position. Only package names are allowed + Leaving directory 'f' [1] $ rm f/dune diff --git a/test/blackbox-tests/test-cases/coq/coqtop/coqtop-recomp.t b/test/blackbox-tests/test-cases/coq/coqtop/coqtop-recomp.t index 8c22f2bfa7b..bfc0cde82f4 100644 --- a/test/blackbox-tests/test-cases/coq/coqtop/coqtop-recomp.t +++ b/test/blackbox-tests/test-cases/coq/coqtop/coqtop-recomp.t @@ -31,8 +31,10 @@ https://github.com/ocaml/dune/pull/5457#issuecomment-1084161587). coqdep dir/bar.v.d coqdep dir/foo.v.d coqc dir/foo.{glob,vo} + Leaving directory '..' -topfile $TESTCASE_ROOT/_build/default/dir/bar.v -q -w -deprecated-native-compiler-option -w -native-compiler-disabled -native-compiler ondemand -R $TESTCASE_ROOT/_build/default/dir basic $ (cd dir && dune coq top --root .. --display short --toplevel echo dir/bar.v) Entering directory '..' + Leaving directory '..' -topfile $TESTCASE_ROOT/_build/default/dir/bar.v -q -w -deprecated-native-compiler-option -w -native-compiler-disabled -native-compiler ondemand -R $TESTCASE_ROOT/_build/default/dir basic diff --git a/test/blackbox-tests/test-cases/depend-on/installed-packages.t b/test/blackbox-tests/test-cases/depend-on/installed-packages.t index abf3ce6cac2..f765864215a 100644 --- a/test/blackbox-tests/test-cases/depend-on/installed-packages.t +++ b/test/blackbox-tests/test-cases/depend-on/installed-packages.t @@ -17,12 +17,14 @@ $ dune build --root a Entering directory 'a' + Leaving directory 'a' $ dune install --root a --prefix $(pwd)/prefix Entering directory 'a' Installing $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/dune-package Installing $TESTCASE_ROOT/prefix/share/a/CATME + Leaving directory 'a' $ cat >b/dune-project < (lang dune 2.9) @@ -36,9 +38,11 @@ $ OCAMLPATH=$(pwd)/prefix/lib/:$OCAMLPATH dune build --root b @runtest Entering directory 'b' Miaou + Leaving directory 'b' $ OCAMLPATH=$(pwd)/prefix/lib/:$OCAMLPATH dune build --root b @runtest Entering directory 'b' + Leaving directory 'b' $ rm a/CATME $ cat >a/CATME <b/dune-project < (lang dune 2.8) @@ -75,4 +83,5 @@ 1 | (rule (alias runtest) (deps (package a)) (action (run cat $TESTCASE_ROOT/prefix/share/a/CATME))) ^ Error: Dependency on an installed package requires at least (lang dune 2.9) + Leaving directory 'b' [1] diff --git a/test/blackbox-tests/test-cases/dune-init.t/run.t b/test/blackbox-tests/test-cases/dune-init.t/run.t index 139f20d4663..fe1fd569b9c 100644 --- a/test/blackbox-tests/test-cases/dune-init.t/run.t +++ b/test/blackbox-tests/test-cases/dune-init.t/run.t @@ -346,6 +346,7 @@ We can build the project: $ dune build --root test_exec_proj Entering directory 'test_exec_proj' + Leaving directory 'test_exec_proj' And the opam file will be generated as expected @@ -386,12 +387,14 @@ We can build and run the resulting executable: $ dune exec --root test_exec_proj ./bin/main.exe Entering directory 'test_exec_proj' + Leaving directory 'test_exec_proj' Hello, World! We can build and run the project's tests: $ dune exec --root test_exec_proj ./test/test_exec_proj.exe Entering directory 'test_exec_proj' + Leaving directory 'test_exec_proj' Initializing library projects ================================ @@ -448,6 +451,7 @@ We can build and install the project: $ dune build --root test_lib_proj @install Entering directory 'test_lib_proj' + Leaving directory 'test_lib_proj' And the opam file will be generated as expected @@ -492,6 +496,7 @@ And we we can run the tests: ocamlopt test/.test_lib_proj.eobjs/native/dune__exe__Test_lib_proj.{cmx,o} ocamlopt test/test_lib_proj.exe test_lib_proj alias test/runtest + Leaving directory 'test_lib_proj' Initializing projects using Esy =============================== diff --git a/test/blackbox-tests/test-cases/dune-package.t/run.t b/test/blackbox-tests/test-cases/dune-package.t/run.t index 89c9b179c0e..600bfc072e9 100644 --- a/test/blackbox-tests/test-cases/dune-package.t/run.t +++ b/test/blackbox-tests/test-cases/dune-package.t/run.t @@ -3,6 +3,7 @@ $ dune build --root=a Entering directory 'a' + Leaving directory 'a' $ dune_cmd cat a/_build/install/default/lib/a/dune-package | sed "s/(lang dune .*)/(lang dune )/" | dune_cmd sanitize (lang dune ) (name a) @@ -106,6 +107,7 @@ Build with "--store-orig-source-dir" profile $ dune build --root=a --store-orig-source-dir Entering directory 'a' + Leaving directory 'a' $ dune_cmd cat a/_build/install/default/lib/a/dune-package | grep -A 1 '(orig_src_dir' (orig_src_dir $TESTCASE_ROOT/a) @@ -119,6 +121,7 @@ Build with "--store-orig-source-dir" profile Build with "DUNE_STORE_ORIG_SOURCE_DIR=true" profile $ DUNE_STORE_ORIG_SOURCE_DIR=true dune build --root=a Entering directory 'a' + Leaving directory 'a' $ dune_cmd cat a/_build/install/default/lib/a/dune-package | grep -A 1 '(orig_src_dir' (orig_src_dir $TESTCASE_ROOT/a) @@ -133,6 +136,7 @@ Install the package directly $ dune install "--prefix=$PWD/prefix" --root=a 2>&1 | grep -v "Installing" Entering directory 'a' + Leaving directory 'a' $ dune_cmd cat prefix/lib/a/dune-package | grep -e 'lib/a' -e 'share/a' $TESTCASE_ROOT/prefix/lib/a) diff --git a/test/blackbox-tests/test-cases/dune-ppx-driver-system.t/run.t b/test/blackbox-tests/test-cases/dune-ppx-driver-system.t/run.t index 5c4c17a35f5..a9e0a90beef 100644 --- a/test/blackbox-tests/test-cases/dune-ppx-driver-system.t/run.t +++ b/test/blackbox-tests/test-cases/dune-ppx-driver-system.t/run.t @@ -15,6 +15,7 @@ No ppx driver found 5 | (preprocess (pps))) ^^^^^ Error: You must specify at least one ppx rewriter. + Leaving directory 'no-driver' [1] Too many drivers @@ -26,6 +27,7 @@ Too many drivers ^^^^^^^^^^^^^^^ Error: Too many incompatible ppx drivers were found: foo.driver1 and foo.driver2. + Leaving directory 'driver-tests' [1] Not compatible with Dune @@ -38,6 +40,7 @@ Not compatible with Dune Error: No ppx driver were found. It seems that ppx_other is not compatible with Dune. Examples of ppx rewriters that are compatible with Dune are ones using ocaml-migrate-parsetree, ppxlib or ppx_driver. + Leaving directory 'driver-tests' [1] Incompatible Cookies @@ -49,6 +52,7 @@ Incompatible Cookies ^^^^^^^^^^^^^^^ Error: foo.ppx3 and foo.ppx4 have inconsistent requests for cookie "germany"; foo.ppx3 requests "spritzgeback" and foo.ppx4 requests "lebkuchen" + Leaving directory 'driver-tests' [1] Same, but with error pointing to .ppx @@ -56,11 +60,13 @@ Same, but with error pointing to .ppx $ dune build --root driver-tests .ppx/foo.ppx1+foo.ppx2/ppx.exe Entering directory 'driver-tests' Error: invalid ppx key for _build/default/.ppx/foo.ppx1+foo.ppx2/ppx.exe + Leaving directory 'driver-tests' [1] $ dune build --root driver-tests .ppx/foo.ppx-other/ppx.exe Entering directory 'driver-tests' Error: invalid ppx key for _build/default/.ppx/foo.ppx-other/ppx.exe + Leaving directory 'driver-tests' [1] Test the argument syntax @@ -90,6 +96,7 @@ Test the argument syntax 95 | -foo bar %{env:ENGLAND=undefined}))) Error: Rule failed to generate the following targets: - test_ppx_args.pp.ml + Leaving directory 'driver-tests' [1] Test the argument syntax with list expansion allowed (dune > 3.2) @@ -123,6 +130,7 @@ Test the argument syntax with list expansion allowed (dune > 3.2) 24 | -foo bar %{env:ENGLAND=undefined} %{read-lines:ppx-args}))) Error: Rule failed to generate the following targets: - test_ppx_args.pp.ml + Leaving directory 'driver-tests-list-args' [1] Test that going through the -ppx option of the compiler works @@ -131,11 +139,13 @@ Test that going through the -ppx option of the compiler works Entering directory 'driver-tests' tool name: ocamlc args:--as-ppx -arg1 -arg2 -arg3=Oreo -foo bar Snickerdoodle --cookie france="Petit Beurre" --cookie italy="Biscotti" --cookie library-name="test_ppx_staged" + Leaving directory 'driver-tests' Test using installed drivers $ dune build --root driver @install Entering directory 'driver' + Leaving directory 'driver' $ OCAMLPATH=driver/_build/install/default/lib dune build --root use-external-driver driveruser.cma Entering directory 'use-external-driver' .ppx/35d69311d5da258d073875db2b34f33b/ppx.exe @@ -155,6 +165,7 @@ Test using installed drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Error: Rule failed to generate the following targets: - driveruser.pp.ml + Leaving directory 'use-external-driver' [1] $ OCAMLPATH=driver/_build/install/default/lib dune build --root replaces driveruser.cma @@ -177,10 +188,12 @@ Test using installed drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Error: Rule failed to generate the following targets: - driveruser.pp.ml + Leaving directory 'replaces' [1] $ OCAMLPATH=driver/_build/install/default/lib dune build --root driver-replaces @install Entering directory 'driver-replaces' + Leaving directory 'driver-replaces' $ OCAMLPATH=driver/_build/install/default/lib:driver-replaces/_build/install/default/lib dune build --root replaces-external driveruser.cma Entering directory 'replaces-external' replacesdriver @@ -201,4 +214,5 @@ Test using installed drivers ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Error: Rule failed to generate the following targets: - driveruser.pp.ml + Leaving directory 'replaces-external' [1] diff --git a/test/blackbox-tests/test-cases/dup-fields.t/run.t b/test/blackbox-tests/test-cases/dup-fields.t/run.t index e22193a2f14..fb6b62f04b0 100644 --- a/test/blackbox-tests/test-cases/dup-fields.t/run.t +++ b/test/blackbox-tests/test-cases/dup-fields.t/run.t @@ -6,4 +6,5 @@ Duplicating a field in a dune file is an error: 4 | (action (echo bar))) ^^^^^^^^^^^^^^^^^^^ Error: Field "action" is present too many times + Leaving directory 'dune' [1] diff --git a/test/blackbox-tests/test-cases/exec-cmd.t/run.t b/test/blackbox-tests/test-cases/exec-cmd.t/run.t index 5e6d2e0485d..20f34462b7a 100644 --- a/test/blackbox-tests/test-cases/exec-cmd.t/run.t +++ b/test/blackbox-tests/test-cases/exec-cmd.t/run.t @@ -23,6 +23,7 @@ $ (cd test; dune exec --root .. -- dunetestbar) Entering directory '..' + Leaving directory '..' Bar $ ls -a test/_build diff --git a/test/blackbox-tests/test-cases/exes-with-c.t/run.t b/test/blackbox-tests/test-cases/exes-with-c.t/run.t index 145a671b297..cacd678d301 100644 --- a/test/blackbox-tests/test-cases/exes-with-c.t/run.t +++ b/test/blackbox-tests/test-cases/exes-with-c.t/run.t @@ -21,4 +21,5 @@ 4 | (foreign_stubs (language c) (names stubs))) Error: Pure bytecode executables cannot contain foreign stubs. Hint: If you only need to build a native executable use "(modes exe)". + Leaving directory 'err' [1] diff --git a/test/blackbox-tests/test-cases/findlib-error.t/run.t b/test/blackbox-tests/test-cases/findlib-error.t/run.t index 746b8447120..2b50abc5b9e 100644 --- a/test/blackbox-tests/test-cases/findlib-error.t/run.t +++ b/test/blackbox-tests/test-cases/findlib-error.t/run.t @@ -7,4 +7,5 @@ We are dropping support for findlib in dune ^^^^^^^^^^^^^^ Error: %{findlib:..} was renamed to '%{lib:..}' in the 1.0 version of the dune language + Leaving directory 'in-dune' [1] diff --git a/test/blackbox-tests/test-cases/foreign-library.t b/test/blackbox-tests/test-cases/foreign-library.t index 929ca89c4fd..a6e6d098c94 100644 --- a/test/blackbox-tests/test-cases/foreign-library.t +++ b/test/blackbox-tests/test-cases/foreign-library.t @@ -743,6 +743,7 @@ Testsuite for the (foreign_library ...) stanza. $ export OCAMLPATH=$PWD/external/install/lib; ./sdune exec ./main.exe --root=some/dir Entering directory 'some/dir' + Leaving directory 'some/dir' Answer = 42 ---------------------------------------------------------------------------------- @@ -791,6 +792,7 @@ Testsuite for the (foreign_library ...) stanza. 2 | (archive_name some/path/id) ^^^^^^^^^^^^ Error: Path separators are not allowed in archive names. + Leaving directory 'github2914/dir' [1] ---------------------------------------------------------------------------------- @@ -902,5 +904,6 @@ Testsuite for the (foreign_library ...) stanza. > EOF $ dune build --root stubs_in_libs Entering directory 'stubs_in_libs' + Leaving directory 'stubs_in_libs' $ stubs_in_libs/_build/default/main.exe 12 diff --git a/test/blackbox-tests/test-cases/github1549.t/run.t b/test/blackbox-tests/test-cases/github1549.t/run.t index f5506f078ff..a666c1578f8 100644 --- a/test/blackbox-tests/test-cases/github1549.t/run.t +++ b/test/blackbox-tests/test-cases/github1549.t/run.t @@ -2,6 +2,7 @@ Reproduction case for #1549: too many parentheses in installed .dune files $ dune build @install --root backend Entering directory 'backend' + Leaving directory 'backend' $ dune_cmd cat backend/_build/install/default/lib/dune_inline_tests/dune-package | sed "s/(lang dune .*)/(lang dune )/" | dune_cmd sanitize (lang dune ) @@ -45,3 +46,4 @@ Reproduction case for #1549: too many parentheses in installed .dune files $ env OCAMLPATH=backend/_build/install/default/lib dune runtest --root example Entering directory 'example' + Leaving directory 'example' diff --git a/test/blackbox-tests/test-cases/github1616.t/run.t b/test/blackbox-tests/test-cases/github1616.t/run.t index 4cea9ff4f1e..3d405271edb 100644 --- a/test/blackbox-tests/test-cases/github1616.t/run.t +++ b/test/blackbox-tests/test-cases/github1616.t/run.t @@ -3,3 +3,4 @@ Regression test for #1616 $ env PATH="$PWD/bin2:$PWD/bin1:$PATH" dune build --root root Entering directory 'root' Hello, World! + Leaving directory 'root' diff --git a/test/blackbox-tests/test-cases/inline_tests/dune-file.t/run.t b/test/blackbox-tests/test-cases/inline_tests/dune-file.t/run.t index 1baaf505cfc..03e36b923b3 100644 --- a/test/blackbox-tests/test-cases/inline_tests/dune-file.t/run.t +++ b/test/blackbox-tests/test-cases/inline_tests/dune-file.t/run.t @@ -28,3 +28,4 @@ package: $ export OCAMLPATH=$PWD/_install/lib; dune runtest --root dune-file-user Entering directory 'dune-file-user' 414243 + Leaving directory 'dune-file-user' diff --git a/test/blackbox-tests/test-cases/inline_tests/executable-flags.t/run.t b/test/blackbox-tests/test-cases/inline_tests/executable-flags.t/run.t index 6a14023cf24..e8ee5bde8b6 100644 --- a/test/blackbox-tests/test-cases/inline_tests/executable-flags.t/run.t +++ b/test/blackbox-tests/test-cases/inline_tests/executable-flags.t/run.t @@ -7,6 +7,7 @@ to be successful. $ dune runtest valid_options --root ./test-project Entering directory 'test-project' backend_foo + Leaving directory 'test-project' Lastly, we pass an invalid option to flags field expecting compilation to fail. diff --git a/test/blackbox-tests/test-cases/instrumentation.t/run.t b/test/blackbox-tests/test-cases/instrumentation.t/run.t index 3c32f3e0d4e..abb7e19f6ec 100644 --- a/test/blackbox-tests/test-cases/instrumentation.t/run.t +++ b/test/blackbox-tests/test-cases/instrumentation.t/run.t @@ -187,5 +187,6 @@ Next, we check the backend can be used when it is installed. > EOF $ OCAMLPATH=$PWD/_install/lib:$OCAMLPATH dune build --root installed Entering directory 'installed' + Leaving directory 'installed' $ installed/_build/default/main.exe Hello from Main! diff --git a/test/blackbox-tests/test-cases/lib.t b/test/blackbox-tests/test-cases/lib.t index 0f643fdee63..aa0a9f45b3f 100644 --- a/test/blackbox-tests/test-cases/lib.t +++ b/test/blackbox-tests/test-cases/lib.t @@ -177,6 +177,7 @@ Testsuite for the %{lib...} and %{lib-private...} variable. Error: The variable "lib-private" can only refer to libraries within the same project. The current project's name is "test-lib", but the reference is to an external library. + Leaving directory 'src' [1] ---------------------------------------------------------------------------------- diff --git a/test/blackbox-tests/test-cases/libexec.t b/test/blackbox-tests/test-cases/libexec.t index e9172ca0079..bb154fef34e 100644 --- a/test/blackbox-tests/test-cases/libexec.t +++ b/test/blackbox-tests/test-cases/libexec.t @@ -202,6 +202,7 @@ Testsuite for the %{libexec...} and %{libexec-private...} variable. Error: The variable "libexec-private" can only refer to libraries within the same project. The current project's name is "test-lib", but the reference is to an external library. + Leaving directory 'src' [1] $ export OCAMLPATH=$PWD/external/install/lib; ./sdune build @find-a-from-target --root=src --workspace=./dune-workspace @@ -212,6 +213,7 @@ Testsuite for the %{libexec...} and %{libexec-private...} variable. Error: The variable "libexec-private" can only refer to libraries within the same project. The current project's name is "test-lib", but the reference is to an external library. + Leaving directory 'src' [1] ---------------------------------------------------------------------------------- diff --git a/test/blackbox-tests/test-cases/link-includes.t b/test/blackbox-tests/test-cases/link-includes.t index 537d56efbf1..8d765cb3f9e 100644 --- a/test/blackbox-tests/test-cases/link-includes.t +++ b/test/blackbox-tests/test-cases/link-includes.t @@ -20,6 +20,7 @@ Test linktime includes for an external library with C stubs > EOF $ dune build --root lib1 @install Entering directory 'lib1' + Leaving directory 'lib1' First we create an external library and implementation $ mkdir exe @@ -34,5 +35,6 @@ First we create an external library and implementation Then we make sure that it works fine. $ env OCAMLPATH=lib1/_build/install/default/lib: dune exec --root exe ./bar.exe Entering directory 'exe' + Leaving directory 'exe' lib1: 42 diff --git a/test/blackbox-tests/test-cases/meta-template-version-bug.t b/test/blackbox-tests/test-cases/meta-template-version-bug.t index 21cbdf81bdd..12c09f3fa74 100644 --- a/test/blackbox-tests/test-cases/meta-template-version-bug.t +++ b/test/blackbox-tests/test-cases/meta-template-version-bug.t @@ -47,4 +47,5 @@ custom version: $ OCAMLPATH=$PWD/_install/lib dune exec --root external ./main.exe Entering directory 'external' + Leaving directory 'external' foobarlib diff --git a/test/blackbox-tests/test-cases/old-dune-subsystem.t/run.t b/test/blackbox-tests/test-cases/old-dune-subsystem.t/run.t index bc3133c00b2..cc30e824df1 100644 --- a/test/blackbox-tests/test-cases/old-dune-subsystem.t/run.t +++ b/test/blackbox-tests/test-cases/old-dune-subsystem.t/run.t @@ -13,4 +13,5 @@ we understand the old files. 3 | (inline_tests (backend dune_inline_tests))) ^^^^^^^^^^^^^^^^^ Error: dune_inline_tests is not an inline tests backend + Leaving directory 'example' [1] diff --git a/test/blackbox-tests/test-cases/private-package-lib/main.t b/test/blackbox-tests/test-cases/private-package-lib/main.t index 804c27eda98..53722a2ded7 100644 --- a/test/blackbox-tests/test-cases/private-package-lib/main.t +++ b/test/blackbox-tests/test-cases/private-package-lib/main.t @@ -157,6 +157,7 @@ Now we make sure such libraries are transitively usable when installed: $ export OCAMLPATH=$PWD/_build/install/default/lib $ dune exec --root use -- ./run.exe Entering directory 'use' + Leaving directory 'use' Using library foo: from library foo secret string But we cannot use such libraries directly: @@ -170,4 +171,5 @@ But we cannot use such libraries directly: 1 | print_endline ("direct access attempt: " ^ Secret.secret) ^^^^^^^^^^^^^ Error: Unbound module Secret + Leaving directory 'use' [1] diff --git a/test/blackbox-tests/test-cases/reason.t/run.t b/test/blackbox-tests/test-cases/reason.t/run.t index 5cdd11a847f..5a1c7396976 100644 --- a/test/blackbox-tests/test-cases/reason.t/run.t +++ b/test/blackbox-tests/test-cases/reason.t/run.t @@ -24,3 +24,4 @@ We make sure to install reason source files: virtual libraries in reason $ PATH="_build/install/default/bin:$PATH" dune build --root vlib-impl @all Entering directory 'vlib-impl' + Leaving directory 'vlib-impl' diff --git a/test/blackbox-tests/test-cases/rule/dependency-external.t b/test/blackbox-tests/test-cases/rule/dependency-external.t index ccaf0c5f7af..b833ab68c7b 100644 --- a/test/blackbox-tests/test-cases/rule/dependency-external.t +++ b/test/blackbox-tests/test-cases/rule/dependency-external.t @@ -22,9 +22,11 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt1 + Leaving directory 'a/b' $ dune build --root=a/b @test Entering directory 'a/b' + Leaving directory 'a/b' $ cat >external.txt < txt2 @@ -33,6 +35,7 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt2 + Leaving directory 'a/b' ## Test copy files absolute $ cat >a/b/dune <external.txt < txt2 @@ -61,6 +66,7 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt2 + Leaving directory 'a/b' ### 1 level below @@ -78,10 +84,12 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt1 + Leaving directory 'a/b' # Check that nothing is done when nothing change $ dune build --root=a/b @test Entering directory 'a/b' + Leaving directory 'a/b' $ cat >a/external.txt < txt2 @@ -90,6 +98,7 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt2 + Leaving directory 'a/b' ## Test copy files 1 level below $ cat >a/b/dune <a/external.txt < txt2 @@ -118,6 +129,7 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt2 + Leaving directory 'a/b' ### 2 level below @@ -137,10 +149,12 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt1 + Leaving directory 'a/b' # Check that nothing is done when nothing change $ dune build --root=a/b @test Entering directory 'a/b' + Leaving directory 'a/b' $ cat >external.txt < txt2 @@ -149,6 +163,7 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt2 + Leaving directory 'a/b' ## Test copy files 2 level below $ cat >a/b/dune <external.txt < txt2 @@ -177,6 +194,7 @@ rules with dependencies outside the build dir are allowed $ dune build --root=a/b @test Entering directory 'a/b' txt2 + Leaving directory 'a/b' ## Test dune exec absolute $ cat >a/script.sh < EOF $ dune build --root external @install Entering directory 'external' + Leaving directory 'external' $ mkdir test $ echo "(lang dune 2.5)" > test/dune-project $ cat >test/dune < EOF $ dune build --root 2.3 target | head -c1 Entering directory '2.3' + Leaving directory '2.3' $ dune_cmd stat permissions 2.3/_build/default/target | head -c1 6 @@ -47,6 +48,7 @@ Check that dune >= 2.4 removes target write permissions. > EOF $ dune build --root 2.4 foo.exe @install Entering directory '2.4' + Leaving directory '2.4' $ dune_cmd stat permissions 2.4/_build/default/foo.exe | head -c1 5 $ dune install --root 2.4 --prefix ./ @@ -56,6 +58,7 @@ Check that dune >= 2.4 removes target write permissions. Installing bin/foo Installing bin/foo.exe Installing share/foo/target + Leaving directory '2.4' $ dune_cmd stat permissions 2.4/bin/foo.exe | head -c1 7 $ dune_cmd stat permissions 2.4/share/foo/target | head -c1