From 30d254212c83e419bf8580e13b36cf0c17b1a6e8 Mon Sep 17 00:00:00 2001 From: Ali Caglayan Date: Sun, 19 Feb 2023 16:12:24 +0000 Subject: [PATCH] fix(install): respect display options Signed-off-by: Ali Caglayan --- CHANGES.md | 3 ++ bin/install_uninstall.ml | 7 ++-- otherlibs/build-info/test/run.t | 6 ++-- otherlibs/site/test/github4389.t/run.t | 3 -- .../github4389_without_build_info.t/run.t | 3 -- otherlibs/site/test/run.t | 17 ++++++---- otherlibs/site/test/run_2_9.t | 17 ++++++---- .../test-cases/depend-on/installed-packages.t | 4 +-- .../deprecated-library-name/features.t | 4 +-- .../directory-targets/install-dir-target.t | 2 +- .../test-cases/dune-package.t/run.t | 2 +- .../test-cases/foreign-library.t | 3 +- .../test-cases/github2228.t/run.t | 2 +- test/blackbox-tests/test-cases/github2629.t | 2 +- test/blackbox-tests/test-cases/github3727.t | 2 +- .../test-cases/inline_tests/dune-file.t/run.t | 2 +- .../test-cases/install-dir/install-bindir.t | 2 +- .../test-cases/install-dir/install-datadir.t | 2 +- .../test-cases/install-dir/install-docdir.t | 2 +- .../test-cases/install-dir/install-etcdir.t | 2 +- .../install-dir/install-libdir.t/run.t | 20 +++++------ .../test-cases/install-dir/install-mandir.t | 2 +- .../test-cases/install-dry-run.t/run.t | 4 +-- .../test-cases/install-multiple-contexts.t | 4 +-- .../test-cases/install-single-section.t/run.t | 4 +-- .../test-cases/install-with-var.t/run.t | 2 +- .../test-cases/install/cmxs_exec.t | 8 ++--- .../test-cases/install/display.t | 34 +++++++++++++++++++ .../test-cases/instrumentation.t/run.t | 2 +- .../test-cases/jsoo/build-info.t/run.t | 23 ++----------- test/blackbox-tests/test-cases/lib.t | 3 +- test/blackbox-tests/test-cases/libexec.t | 3 +- .../test-cases/melange/basic-install.t | 2 +- .../test-cases/melange/depend-on-installed.t | 2 +- .../melange/emit-installed-two-modes.t | 2 +- .../test-cases/melange/emit-installed.t | 2 +- .../test-cases/melange/emit-private.t | 2 +- .../test-cases/melange/gh7020.t | 2 +- .../test-cases/meta-template-version-bug.t | 2 +- .../test-cases/uninstall-mandir.t | 4 +-- .../vendor/do-not-install-vendored-packages.t | 2 +- .../test-cases/version-corruption.t | 2 +- .../test-cases/write-permissions.t | 2 +- 43 files changed, 125 insertions(+), 95 deletions(-) create mode 100644 test/blackbox-tests/test-cases/install/display.t diff --git a/CHANGES.md b/CHANGES.md index 6d1936474c9b..6d2f4ea241ed 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -7,6 +7,9 @@ Unreleased - Invoke preprocessor commands from directory of dune file containing the commands rather than from the workspace root (#7057, fixes #7043, @gridbugs) +- dune install now respects --display=quiet mode (#7116, fixes #4573, fixes + #7106, @Alizter) + 3.7.0 (2023-02-17) ------------------ diff --git a/bin/install_uninstall.ml b/bin/install_uninstall.ml index 287bd161b13c..b2a2ec10e65c 100644 --- a/bin/install_uninstall.ml +++ b/bin/install_uninstall.ml @@ -718,8 +718,11 @@ let install_uninstall ~what = | true -> Ops.remove_dir_if_exists ~if_non_empty:Fail dst | false -> Ops.remove_file_if_exists dst); - print_line "%s %s" msg - (Path.to_string_maybe_quoted dst); + (match config.display.verbosity with + | Quiet -> () + | _ -> + print_line "%s %s" msg + (Path.to_string_maybe_quoted dst)); Ops.mkdir_p dir; let executable = Section.should_set_executable_bit entry.section diff --git a/otherlibs/build-info/test/run.t b/otherlibs/build-info/test/run.t index 5deee4963974..b83081602d87 100755 --- a/otherlibs/build-info/test/run.t +++ b/otherlibs/build-info/test/run.t @@ -52,7 +52,7 @@ Test embedding of build information > EOF $ dune build - $ dune install --prefix _install 2> /dev/null + $ dune install --prefix _install Inside _build, we have no version information: @@ -130,7 +130,7 @@ craft an example with a single placeholder to make the output stable: $ cp c/c.ml d/d.ml $ dune build d/d.install - $ dune install d --prefix _install --debug-artifact-substitution 2>&1|grep -v '^\(Installing\|Deleting\)' + $ dune install d --prefix _install --debug-artifact-substitution Found placeholder in _build/install/default/bin/d: - placeholder: Vcs_describe In_source_tree "d" - evaluates to: "1.0+d" @@ -149,7 +149,7 @@ Version is picked from dune-project if available $ echo '(version project-version)' >> c/dune-project $ dune build - $ dune install --prefix _install 2> /dev/null + $ dune install --prefix _install $ _install/bin/c | sed 's/build-info: .*/build-info: XXX/' project-version lib a: 1.0+a diff --git a/otherlibs/site/test/github4389.t/run.t b/otherlibs/site/test/github4389.t/run.t index 8b85b37dc4b6..b154c79322a6 100644 --- a/otherlibs/site/test/github4389.t/run.t +++ b/otherlibs/site/test/github4389.t/run.t @@ -1,8 +1,5 @@ $ dune build @install $ dune install --prefix _install - Installing _install/lib/github4389/META - Installing _install/lib/github4389/dune-package - Installing _install/bin/main $ grep sites _install/lib/github4389/dune-package (sites (github4389 share)) $ grep -o '[^ ]*/_install/share/github4389' _install/lib/github4389/dune-package diff --git a/otherlibs/site/test/github4389_without_build_info.t/run.t b/otherlibs/site/test/github4389_without_build_info.t/run.t index e12dd9220f64..406affa9b1ae 100644 --- a/otherlibs/site/test/github4389_without_build_info.t/run.t +++ b/otherlibs/site/test/github4389_without_build_info.t/run.t @@ -1,8 +1,5 @@ $ dune build @install $ dune install --prefix _install - Installing _install/lib/github4389/META - Installing _install/lib/github4389/dune-package - Installing _install/bin/main $ grep sites _install/lib/github4389/dune-package (sites (github4389 share)) $ grep -o '[^ ]*/_install/share/github4389' _install/lib/github4389/dune-package diff --git a/otherlibs/site/test/run.t b/otherlibs/site/test/run.t index 002baf4a7fd1..ccd835d47c41 100644 --- a/otherlibs/site/test/run.t +++ b/otherlibs/site/test/run.t @@ -175,13 +175,18 @@ Test with an opam like installation $ test -e a/a.install [1] - $ dune install -p a --create-install-files a 2>&1 | sed -e "/^Copying/d" + $ dune install -p a --create-install-files a + Error: The mandir installation directory is unknown. + Hint: It could be specified with --mandir + [1] $ grep "_destdir" a/a.install -c - 7 + grep: a/a.install: No such file or directory + [2] $ grep "_build" a/a.install -c - 12 + grep: a/a.install: No such file or directory + [2] Build everything ---------------- @@ -191,7 +196,7 @@ Build everything Test with a normal installation -------------------------------- - $ dune install --prefix _install 2>&1 | sed -e "/^Installing/d" + $ dune install --prefix _install Once installed, we have the sites information: @@ -213,7 +218,7 @@ Once installed, we have the sites information: Test with a relocatable installation -------------------------------- - $ dune install --prefix _install_relocatable --relocatable 2>&1 | sed -e "/^Installing/d" + $ dune install --prefix _install_relocatable --relocatable Once installed, we have the sites information: @@ -354,7 +359,7 @@ Test compiling an external plugin info.txt is found: true run c: registered:e,b. - $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH dune install --root=e --prefix $(pwd)/_install 2>&1 | sed -e "/^Installing/d" + $ OCAMLPATH=$(pwd)/_install/lib:$OCAMLPATH dune install --root=e --prefix $(pwd)/_install $ OCAMLPATH=_install/lib:$OCAMLPATH _install/bin/c run a diff --git a/otherlibs/site/test/run_2_9.t b/otherlibs/site/test/run_2_9.t index 822c0cb15939..856e1e81a884 100644 --- a/otherlibs/site/test/run_2_9.t +++ b/otherlibs/site/test/run_2_9.t @@ -163,13 +163,18 @@ Test with an opam like installation $ test -e a/a.install [1] - $ dune install -p a --create-install-files a 2> /dev/null + $ dune install -p a --create-install-files a + Error: The mandir installation directory is unknown. + Hint: It could be specified with --mandir + [1] $ grep "_destdir" a/a.install -c - 7 + grep: a/a.install: No such file or directory + [2] $ grep "_build" a/a.install -c - 12 + grep: a/a.install: No such file or directory + [2] Build everything ---------------- @@ -179,7 +184,7 @@ Build everything Test with a normal installation -------------------------------- - $ dune install --prefix _install 2> /dev/null + $ dune install --prefix _install Once installed, we have the sites information: @@ -198,7 +203,7 @@ Once installed, we have the sites information: Test with a relocatable installation -------------------------------- - $ dune install --prefix _install_relocatable --relocatable 2> /dev/null + $ dune install --prefix _install_relocatable --relocatable Once installed, we have the sites information: @@ -339,7 +344,7 @@ Test compiling an external plugin info.txt is found: true run c: registered:e,b. - $ OCAMLPATH=$PWD/_install/lib:$OCAMLPATH dune install --root=e --prefix $PWD/_install 2> /dev/null + $ OCAMLPATH=$PWD/_install/lib:$OCAMLPATH dune install --root=e --prefix $PWD/_install $ OCAMLPATH=_install/lib:$OCAMLPATH _install/bin/c run a 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 1834ecd69f99..804a0e55d97a 100644 --- a/test/blackbox-tests/test-cases/depend-on/installed-packages.t +++ b/test/blackbox-tests/test-cases/depend-on/installed-packages.t @@ -19,7 +19,7 @@ Entering directory 'a' Leaving directory 'a' - $ dune install --root a --prefix $PWD/prefix + $ dune install --root a --prefix $PWD/prefix --display short Installing $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/dune-package Installing $TESTCASE_ROOT/prefix/share/a/CATME @@ -51,7 +51,7 @@ Entering directory 'a' Leaving directory 'a' - $ dune install --root a --prefix $PWD/prefix + $ dune install --root a --prefix $PWD/prefix --display short Deleting $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/META Deleting $TESTCASE_ROOT/prefix/lib/a/dune-package diff --git a/test/blackbox-tests/test-cases/deprecated-library-name/features.t b/test/blackbox-tests/test-cases/deprecated-library-name/features.t index 532a494698a1..f630742b2483 100644 --- a/test/blackbox-tests/test-cases/deprecated-library-name/features.t +++ b/test/blackbox-tests/test-cases/deprecated-library-name/features.t @@ -45,7 +45,7 @@ tests that the "old_public_name" field is evaluated lazily $ (cd a > dune build @install --root . - > dune install --prefix $PWD/../_install) + > dune install --prefix $PWD/../_install --display short) Installing $TESTCASE_ROOT/a/../_install/lib/a/META Installing $TESTCASE_ROOT/a/../_install/lib/a/dune-package @@ -68,7 +68,7 @@ deprecated library will be resolved in the installed world only. $ (cd b > dune build @install --root . - > dune install --prefix $PWD/../_install 2>&1 | dune_cmd sanitize) + > dune install --prefix $PWD/../_install 2>&1 --display short | dune_cmd sanitize) Installing $TESTCASE_ROOT/b/../_install/lib/b/META Installing $TESTCASE_ROOT/b/../_install/lib/b/b$ext_lib Installing $TESTCASE_ROOT/b/../_install/lib/b/b.cma diff --git a/test/blackbox-tests/test-cases/directory-targets/install-dir-target.t b/test/blackbox-tests/test-cases/directory-targets/install-dir-target.t index d6f255109533..f0f62806f01c 100644 --- a/test/blackbox-tests/test-cases/directory-targets/install-dir-target.t +++ b/test/blackbox-tests/test-cases/directory-targets/install-dir-target.t @@ -48,7 +48,7 @@ Allow directories to be installable ] $ mkdir ./installation - $ dune install --prefix ./installation + $ dune install --prefix ./installation --display short Installing installation/lib/foo/META Installing installation/lib/foo/dune-package Installing installation/lib/foo/renamed/x 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 70093bd33c19..75834ba41362 100644 --- a/test/blackbox-tests/test-cases/dune-package.t/run.t +++ b/test/blackbox-tests/test-cases/dune-package.t/run.t @@ -146,7 +146,7 @@ Build with "DUNE_STORE_ORIG_SOURCE_DIR=true" profile Install the package directly - $ dune install "--prefix=$PWD/prefix" --root=a 2>&1 | grep -v "Installing" + $ dune install "--prefix=$PWD/prefix" --root=a [1] $ dune_cmd cat prefix/lib/a/dune-package | grep -e 'lib/a' -e 'share/a' diff --git a/test/blackbox-tests/test-cases/foreign-library.t b/test/blackbox-tests/test-cases/foreign-library.t index a6e6d098c94d..8e25690f4c6b 100644 --- a/test/blackbox-tests/test-cases/foreign-library.t +++ b/test/blackbox-tests/test-cases/foreign-library.t @@ -706,7 +706,8 @@ Testsuite for the (foreign_library ...) stanza. $ rm -rf _build $ touch external/external_library.opam - $ ( cd external && ../sdune build @install && ../sdune install --prefix install 2>&1 | dune_cmd sanitize ) + $ ( cd external && ../sdune build @install \ + > && ../sdune install --prefix install --display=short 2>&1 | dune_cmd sanitize ) Installing install/lib/external_library/META Installing install/lib/external_library/correction.h Installing install/lib/external_library/dune-package diff --git a/test/blackbox-tests/test-cases/github2228.t/run.t b/test/blackbox-tests/test-cases/github2228.t/run.t index e4f0edb083a5..dbfa12016d80 100644 --- a/test/blackbox-tests/test-cases/github2228.t/run.t +++ b/test/blackbox-tests/test-cases/github2228.t/run.t @@ -4,6 +4,6 @@ would fail because the .cmi wasn't correctly copied to the _build/install dir. $ dune build @install $ dune runtest testing - $ dune install --prefix ./installed 2>&1 | grep -i cmi + $ dune install --prefix ./installed --display short 2>&1 | grep -i cmi Installing installed/lib/foobar/foobar.cmi Installing installed/lib/foobar/impl/foobar.cmi diff --git a/test/blackbox-tests/test-cases/github2629.t b/test/blackbox-tests/test-cases/github2629.t index a1dc9c852c08..b6f4124ee977 100644 --- a/test/blackbox-tests/test-cases/github2629.t +++ b/test/blackbox-tests/test-cases/github2629.t @@ -9,7 +9,7 @@ $ export DUNE_BUILD_DIR=$(mktemp -d -t github2629XXXXXX); > dune build @install; > cat $DUNE_BUILD_DIR/default/foo.install | sed s#$DUNE_BUILD_DIR#DUNE_BUILD_DIR#g; - > dune install --dry-run 2>&1 | awk '/Internal/,/External/' + > dune install --dry-run lib: [ "DUNE_BUILD_DIR/install/default/lib/foo/META" "DUNE_BUILD_DIR/install/default/lib/foo/dune-package" diff --git a/test/blackbox-tests/test-cases/github3727.t b/test/blackbox-tests/test-cases/github3727.t index 20bed3c63984..c802c9a39756 100644 --- a/test/blackbox-tests/test-cases/github3727.t +++ b/test/blackbox-tests/test-cases/github3727.t @@ -36,7 +36,7 @@ visible regardless if the stanzas were filtered. $ rm -rf _build $ dune build -p foo - $ dune install foo --prefix ./_install + $ dune install foo --prefix ./_install --display=short Installing _install/lib/foo/META Installing _install/lib/foo/bar/private_foo.a Installing _install/lib/foo/bar/private_foo.cma 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 03e36b923b3e..f47bf5e19cf6 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 @@ -10,7 +10,7 @@ Then we install the backend and check that the "inline_tests.backend" field is properly generated in the installed `dune-package` file: $ dune build dune-file/foo.install - $ dune install foo --prefix _install 2> /dev/null + $ dune install foo --prefix _install $ grep -A8 inline_tests.backend _install/lib/foo/dune-package (inline_tests.backend (runner_libraries str) diff --git a/test/blackbox-tests/test-cases/install-dir/install-bindir.t b/test/blackbox-tests/test-cases/install-dir/install-bindir.t index 8c2adbdd45e3..c5455018e86c 100644 --- a/test/blackbox-tests/test-cases/install-dir/install-bindir.t +++ b/test/blackbox-tests/test-cases/install-dir/install-bindir.t @@ -13,7 +13,7 @@ > EOF $ dune build @install $ mkdir install bindir sbindir - $ dune install --dry-run --prefix ./install --bindir $PWD/bindir --sbindir $PWD/sbindir 2>&1 | grep bindir + $ dune install --dry-run --prefix ./install --bindir $PWD/bindir --sbindir $PWD/sbindir --display short 2>&1 | grep bindir Removing (if it exists) $TESTCASE_ROOT/bindir/user Installing $TESTCASE_ROOT/bindir/user Creating directory $TESTCASE_ROOT/bindir diff --git a/test/blackbox-tests/test-cases/install-dir/install-datadir.t b/test/blackbox-tests/test-cases/install-dir/install-datadir.t index e38971fc1683..b0c73cc69659 100644 --- a/test/blackbox-tests/test-cases/install-dir/install-datadir.t +++ b/test/blackbox-tests/test-cases/install-dir/install-datadir.t @@ -7,7 +7,7 @@ > EOF $ dune build @install $ mkdir install datadir - $ dune install --dry-run --prefix ./install --datadir $PWD/datadir 2>&1 | grep datadir + $ dune install --dry-run --prefix ./install --datadir $PWD/datadir --display short 2>&1 | grep datadir Removing (if it exists) $TESTCASE_ROOT/datadir/foo/datafile Installing $TESTCASE_ROOT/datadir/foo/datafile Creating directory $TESTCASE_ROOT/datadir/foo diff --git a/test/blackbox-tests/test-cases/install-dir/install-docdir.t b/test/blackbox-tests/test-cases/install-dir/install-docdir.t index 23c91bd279d5..796f83a648b0 100644 --- a/test/blackbox-tests/test-cases/install-dir/install-docdir.t +++ b/test/blackbox-tests/test-cases/install-dir/install-docdir.t @@ -7,7 +7,7 @@ > EOF $ dune build @install $ mkdir install docdir - $ dune install --dry-run --prefix ./install --docdir $PWD/docdir 2>&1 | grep docdir + $ dune install --dry-run --prefix ./install --docdir $PWD/docdir --display short 2>&1 | grep docdir Removing (if it exists) $TESTCASE_ROOT/docdir/foo/docfile Installing $TESTCASE_ROOT/docdir/foo/docfile Creating directory $TESTCASE_ROOT/docdir/foo diff --git a/test/blackbox-tests/test-cases/install-dir/install-etcdir.t b/test/blackbox-tests/test-cases/install-dir/install-etcdir.t index 230b66f8ae66..dfdc25753b2d 100644 --- a/test/blackbox-tests/test-cases/install-dir/install-etcdir.t +++ b/test/blackbox-tests/test-cases/install-dir/install-etcdir.t @@ -7,7 +7,7 @@ > EOF $ dune build @install $ mkdir install etcdir - $ dune install --dry-run --prefix ./install --etcdir $PWD/etcdir 2>&1 | grep etcdir + $ dune install --dry-run --prefix ./install --etcdir $PWD/etcdir --display short 2>&1 | grep etcdir Removing (if it exists) $TESTCASE_ROOT/etcdir/foo/configfile Installing $TESTCASE_ROOT/etcdir/foo/configfile Creating directory $TESTCASE_ROOT/etcdir/foo diff --git a/test/blackbox-tests/test-cases/install-dir/install-libdir.t/run.t b/test/blackbox-tests/test-cases/install-dir/install-libdir.t/run.t index 85b572b5df69..d95ff600ff8f 100644 --- a/test/blackbox-tests/test-cases/install-dir/install-libdir.t/run.t +++ b/test/blackbox-tests/test-cases/install-dir/install-libdir.t/run.t @@ -4,7 +4,7 @@ `dune install` should handle destination directories that don't exist $ dune build @install - $ dune install --prefix install --libdir $PWD/install/lib 2>&1 | dune_cmd sanitize + $ dune install --prefix install --libdir $PWD/install/lib --display short 2>&1 | dune_cmd sanitize Installing $TESTCASE_ROOT/install/lib/foo/META Installing $TESTCASE_ROOT/install/lib/foo/dune-package Installing $TESTCASE_ROOT/install/lib/foo/foo$ext_lib @@ -22,7 +22,7 @@ Installing install/man/man3/another-man-page.3 Even if it is possible to ask for different libexecdir than libdir, the installed .cmxs will not be found - $ dune install --prefix install2 --libdir $PWD/install2/lib --libexecdir $PWD/install2/libexec 2>&1 | dune_cmd sanitize + $ dune install --prefix install2 --libdir $PWD/install2/lib --libexecdir $PWD/install2/libexec --display short 2>&1 | dune_cmd sanitize Installing $TESTCASE_ROOT/install2/lib/foo/META Installing $TESTCASE_ROOT/install2/lib/foo/dune-package Installing $TESTCASE_ROOT/install2/lib/foo/foo$ext_lib @@ -41,7 +41,7 @@ Even if it is possible to ask for different libexecdir than libdir, the installe If prefix is passed, the default for libdir is `$prefix/lib`: - $ dune install --prefix install --dry-run 2>&1 | dune_cmd sanitize + $ dune install --prefix install --dry-run --display short 2>&1 | dune_cmd sanitize Removing (if it exists) install/lib/foo/META Installing install/lib/foo/META Creating directory install/lib/foo @@ -106,8 +106,8 @@ If prefix is passed, the default for libdir is `$prefix/lib`: If prefix is not passed, libdir defaults to the opam-prefix/lib directory: $ (export OCAMLFIND_DESTDIR=/OCAMLFIND_DESTDIR - > dune install --dry-run 2>&1 | dune_cmd sanitize - > dune uninstall --dry-run 2>&1 | dune_cmd sanitize) + > dune install --dry-run --display short 2>&1 | dune_cmd sanitize + > dune uninstall --dry-run --display short 2>&1 | dune_cmd sanitize) Removing (if it exists) /OPAM_PREFIX/lib/foo/META Installing /OPAM_PREFIX/lib/foo/META Creating directory /OPAM_PREFIX/lib/foo @@ -192,8 +192,8 @@ If prefix is not passed, libdir defaults to the opam-prefix/lib directory: If only libdir is passed, binaries are installed under prefix/bin and libraries in libdir: - $ dune install --libdir /LIBDIR --dry-run 2>&1 | dune_cmd sanitize - > dune uninstall --libdir /LIBDIR --dry-run + $ dune install --libdir /LIBDIR --dry-run --display short 2>&1 | dune_cmd sanitize + > dune uninstall --libdir /LIBDIR --dry-run --display short Removing (if it exists) /LIBDIR/foo/META Installing /LIBDIR/foo/META Creating directory /LIBDIR/foo @@ -278,7 +278,7 @@ in libdir: The DESTDIR var is supported. When set, it is prepended to the prefix. This is the case when the prefix is implicit: - $ DESTDIR=DESTDIR dune install --dry-run 2>&1 | dune_cmd sanitize + $ DESTDIR=DESTDIR dune install --dry-run --display short 2>&1 | dune_cmd sanitize Removing (if it exists) DESTDIR/OPAM_PREFIX/lib/foo/META Installing DESTDIR/OPAM_PREFIX/lib/foo/META Creating directory DESTDIR/OPAM_PREFIX/lib/foo @@ -342,7 +342,7 @@ This is the case when the prefix is implicit: But also when the prefix is explicit: - $ DESTDIR=DESTDIR dune install --prefix prefix --dry-run 2>&1 | dune_cmd sanitize + $ DESTDIR=DESTDIR dune install --prefix prefix --dry-run --display short 2>&1 | dune_cmd sanitize Removing (if it exists) DESTDIR/prefix/lib/foo/META Installing DESTDIR/prefix/lib/foo/META Creating directory DESTDIR/prefix/lib/foo @@ -406,7 +406,7 @@ But also when the prefix is explicit: DESTDIR can also be passed as a command line flag. - $ dune install --destdir DESTDIR --prefix prefix --dry-run 2>&1 | dune_cmd sanitize + $ dune install --destdir DESTDIR --prefix prefix --dry-run --display short 2>&1 | dune_cmd sanitize Removing (if it exists) DESTDIR/prefix/lib/foo/META Installing DESTDIR/prefix/lib/foo/META Creating directory DESTDIR/prefix/lib/foo diff --git a/test/blackbox-tests/test-cases/install-dir/install-mandir.t b/test/blackbox-tests/test-cases/install-dir/install-mandir.t index 628ee8a6a571..ec71bda82187 100644 --- a/test/blackbox-tests/test-cases/install-dir/install-mandir.t +++ b/test/blackbox-tests/test-cases/install-dir/install-mandir.t @@ -7,7 +7,7 @@ > EOF $ dune build @install $ mkdir install mandir - $ dune install --dry-run --prefix ./install --mandir $PWD/mandir 2>&1 | grep mandir + $ dune install --dry-run --prefix ./install --mandir $PWD/mandir --display short 2>&1 | grep mandir Removing (if it exists) $TESTCASE_ROOT/mandir/manfile Installing $TESTCASE_ROOT/mandir/manfile Creating directory $TESTCASE_ROOT/mandir diff --git a/test/blackbox-tests/test-cases/install-dry-run.t/run.t b/test/blackbox-tests/test-cases/install-dry-run.t/run.t index d4b86913c09d..ecda4b8cf25b 100644 --- a/test/blackbox-tests/test-cases/install-dry-run.t/run.t +++ b/test/blackbox-tests/test-cases/install-dry-run.t/run.t @@ -1,7 +1,7 @@ $ ocamlc_where="$(ocamlc -where)" $ export BUILD_PATH_PREFIX_MAP="/OCAMLC_WHERE=$ocamlc_where:$BUILD_PATH_PREFIX_MAP" $ dune build @install - $ dune install --dry-run 2>&1 --prefix _install | dune_cmd sanitize + $ dune install --dry-run --display short 2>&1 --prefix _install | dune_cmd sanitize Removing (if it exists) _install/lib/mylib/META Installing _install/lib/mylib/META Creating directory _install/lib/mylib @@ -47,7 +47,7 @@ Creating directory _install/lib/mylib Copying _build/install/default/lib/mylib/mylib.cmxs to _install/lib/mylib/mylib.cmxs (executable: true) - $ dune uninstall --dry-run --prefix _install 2>&1 | dune_cmd sanitize + $ dune uninstall --dry-run --prefix _install --display short 2>&1 | dune_cmd sanitize Removing (if it exists) _install/lib/mylib/META Removing (if it exists) _install/lib/mylib/dune-package Removing (if it exists) _install/lib/mylib/mylib$ext_lib diff --git a/test/blackbox-tests/test-cases/install-multiple-contexts.t b/test/blackbox-tests/test-cases/install-multiple-contexts.t index 11cca07ddad8..e8bb3588c006 100644 --- a/test/blackbox-tests/test-cases/install-multiple-contexts.t +++ b/test/blackbox-tests/test-cases/install-multiple-contexts.t @@ -27,12 +27,12 @@ Cannot install into a specific prefix with multiple contexts defined: One must pass a --context argument: - $ dune install --prefix _install/a --context a + $ dune install --prefix _install/a --context a --display short Installing _install/a/lib/a/META Installing _install/a/lib/a/dune-package Installing _install/a/share/a/hello - $ dune install --prefix _install/b --context b + $ dune install --prefix _install/b --context b --display short Installing _install/b/lib/a/META Installing _install/b/lib/a/dune-package Installing _install/b/share/a/hello diff --git a/test/blackbox-tests/test-cases/install-single-section.t/run.t b/test/blackbox-tests/test-cases/install-single-section.t/run.t index fc7810e0ec70..0f9ddbb533d2 100644 --- a/test/blackbox-tests/test-cases/install-single-section.t/run.t +++ b/test/blackbox-tests/test-cases/install-single-section.t/run.t @@ -1,7 +1,7 @@ Dune supports installing a subset of the sections in the .install file. This is particularly useful if one wants to install binaries: $ dune build @install - $ dune install --dry-run --prefix ./ --sections bin,man + $ dune install --dry-run --prefix ./ --sections bin,man --display short Removing (if it exists) bin/foo Installing bin/foo Creating directory bin @@ -13,7 +13,7 @@ particularly useful if one wants to install binaries: Now let's install with the above command with one less section: - $ dune install --dry-run --prefix ./ --sections bin + $ dune install --dry-run --prefix ./ --sections bin --display short Removing (if it exists) bin/foo Installing bin/foo Creating directory bin diff --git a/test/blackbox-tests/test-cases/install-with-var.t/run.t b/test/blackbox-tests/test-cases/install-with-var.t/run.t index fb79a95286d2..ea42a7afed33 100644 --- a/test/blackbox-tests/test-cases/install-with-var.t/run.t +++ b/test/blackbox-tests/test-cases/install-with-var.t/run.t @@ -11,7 +11,7 @@ > EOF $ dune build @install - $ dune install --prefix install --libdir $PWD/install/lib + $ dune install --prefix install --libdir $PWD/install/lib --display short Installing $TESTCASE_ROOT/install/lib/foo/META Installing $TESTCASE_ROOT/install/lib/foo/dune-package Installing $TESTCASE_ROOT/install/lib/foo/opam diff --git a/test/blackbox-tests/test-cases/install/cmxs_exec.t b/test/blackbox-tests/test-cases/install/cmxs_exec.t index 1b0aa7e2ab01..8fef2d143317 100644 --- a/test/blackbox-tests/test-cases/install/cmxs_exec.t +++ b/test/blackbox-tests/test-cases/install/cmxs_exec.t @@ -17,7 +17,7 @@ $ test -x _build/install/default/lib/foo/foo.cmxs - $ dune install --prefix prefix + $ dune install --prefix prefix --display short Installing prefix/lib/foo/META Installing prefix/lib/foo/dune-package Installing prefix/lib/foo/foo.a @@ -37,7 +37,7 @@ directory instead of a file. $ rm -rf prefix $ mkdir -p prefix/lib/foo/foo.a - $ dune install --prefix prefix + $ dune install --prefix prefix --display short Installing prefix/lib/foo/META Installing prefix/lib/foo/dune-package Deleting empty directory prefix/lib/foo/foo.a @@ -56,7 +56,7 @@ Test the error message if a destination is a non-empty directory instead of a fi $ mkdir -p prefix/lib/foo/foo.a $ touch prefix/lib/foo/foo.a/file - $ dune install --prefix prefix + $ dune install --prefix prefix --display short Installing prefix/lib/foo/META Installing prefix/lib/foo/dune-package Error: Please delete non-empty directory prefix/lib/foo/foo.a manually. @@ -66,7 +66,7 @@ Test the error message if a destination is a file instead of a directory. $ rm -rf prefix $ mkdir -p prefix/lib; touch prefix/lib/foo - $ dune install --prefix prefix + $ dune install --prefix prefix --display short Installing prefix/lib/foo/META Error: Please delete file prefix/lib/foo manually. [1] diff --git a/test/blackbox-tests/test-cases/install/display.t b/test/blackbox-tests/test-cases/install/display.t new file mode 100644 index 000000000000..fa8206a0529f --- /dev/null +++ b/test/blackbox-tests/test-cases/install/display.t @@ -0,0 +1,34 @@ +# Test installation display output + + $ cat >dune-project < (lang dune 3.7) + > (package (name foo)) + > EOF + $ cat >dune < (library + > (public_name foo)) + > EOF + + $ cat >foo.ml < let x = "foo" + > EOF + + $ dune build @install + +dune install should not output any "Installing" messages: + + $ dune install --display quiet --prefix prefix + +and for comparison here is the output normally: + + $ dune install --prefix prefix + Deleting prefix/lib/foo/META + Deleting prefix/lib/foo/dune-package + Deleting prefix/lib/foo/foo.a + Deleting prefix/lib/foo/foo.cma + Deleting prefix/lib/foo/foo.cmi + Deleting prefix/lib/foo/foo.cmt + Deleting prefix/lib/foo/foo.cmx + Deleting prefix/lib/foo/foo.cmxa + Deleting prefix/lib/foo/foo.ml + Deleting prefix/lib/foo/foo.cmxs diff --git a/test/blackbox-tests/test-cases/instrumentation.t/run.t b/test/blackbox-tests/test-cases/instrumentation.t/run.t index abb7e19f6eca..d2f2685f4abc 100644 --- a/test/blackbox-tests/test-cases/instrumentation.t/run.t +++ b/test/blackbox-tests/test-cases/instrumentation.t/run.t @@ -166,7 +166,7 @@ Per-context setting takes precedence over per-workspace setting. Next, we check the backend can be used when it is installed. $ dune build ppx/hello.install - $ dune install hello --prefix _install 2>/dev/null + $ dune install hello --prefix _install $ grep instrumentation.backend _install/lib/hello/dune-package (instrumentation.backend hello.ppx)) $ mkdir -p installed diff --git a/test/blackbox-tests/test-cases/jsoo/build-info.t/run.t b/test/blackbox-tests/test-cases/jsoo/build-info.t/run.t index 2fda88c2b722..04b1cc09fb84 100644 --- a/test/blackbox-tests/test-cases/jsoo/build-info.t/run.t +++ b/test/blackbox-tests/test-cases/jsoo/build-info.t/run.t @@ -6,12 +6,7 @@ Jsoo and build-info Warning: Consider passing '-g' option to ocamlc. $ node _build/default/src/main.bc.js unknown - $ dune install --prefix _install - Installing _install/lib/main/META - Installing _install/lib/main/dune-package - Installing _install/lib/main/opam - Installing _install/bin/main - Installing _install/bin/main.bc.js + $ dune install --prefix _install --display short $ node _install/bin/main.bc.js unknown $ git init -q @@ -26,18 +21,12 @@ Jsoo and build-info Warning: Consider passing '-g' option to ocamlc. $ node _build/default/src/main.bc.js unknown - $ dune install --prefix _install + $ dune install --prefix _install --display short Deleting _install/lib/main/META - Installing _install/lib/main/META Deleting _install/lib/main/dune-package - Installing _install/lib/main/dune-package Deleting _install/lib/main/opam - Installing _install/lib/main/opam Deleting _install/bin/main - Installing _install/bin/main Deleting _install/bin/main.bc.js - Installing _install/bin/main.bc.js - Installing _install/doc/main/README $ node _install/bin/main.bc.js v1-1-xxxxx-dirty $ echo "(name main)" >> dune-project @@ -47,18 +36,12 @@ Jsoo and build-info Warning: Consider passing '-g' option to ocamlc. $ node _build/default/src/main.bc.js 0.2.0 - $ dune install --prefix _install + $ dune install --prefix _install --display short Deleting _install/lib/main/META - Installing _install/lib/main/META Deleting _install/lib/main/dune-package - Installing _install/lib/main/dune-package Deleting _install/lib/main/opam - Installing _install/lib/main/opam Deleting _install/bin/main - Installing _install/bin/main Deleting _install/bin/main.bc.js - Installing _install/bin/main.bc.js Deleting _install/doc/main/README - Installing _install/doc/main/README $ node _build/default/src/main.bc.js 0.2.0 diff --git a/test/blackbox-tests/test-cases/lib.t b/test/blackbox-tests/test-cases/lib.t index aa0a9f45b3fa..ab07ea21e835 100644 --- a/test/blackbox-tests/test-cases/lib.t +++ b/test/blackbox-tests/test-cases/lib.t @@ -142,7 +142,8 @@ Testsuite for the %{lib...} and %{lib-private...} variable. > EOF $ touch external/external_library.opam - $ ( cd external && ../sdune build @install && ../sdune install --prefix install | dune_cmd sanitize) + $ ( cd external && ../sdune build @install \ + > && ../sdune install --prefix install --display short | dune_cmd sanitize) Installing install/lib/external_library/META Installing install/lib/external_library/dune-package Installing install/lib/external_library/extlib.a diff --git a/test/blackbox-tests/test-cases/libexec.t b/test/blackbox-tests/test-cases/libexec.t index bb154fef34e0..7c82ae806222 100644 --- a/test/blackbox-tests/test-cases/libexec.t +++ b/test/blackbox-tests/test-cases/libexec.t @@ -162,7 +162,8 @@ Testsuite for the %{libexec...} and %{libexec-private...} variable. > EOF $ touch external/external_library.opam - $ ( cd external && ../sdune build @install && ../sdune install --prefix install | dune_cmd sanitize) + $ ( cd external && ../sdune build @install \ + > && ../sdune install --prefix install --display short | dune_cmd sanitize) Installing install/lib/external_library/META Installing install/lib/external_library/dune-package Installing install/lib/external_library/extlib.a diff --git a/test/blackbox-tests/test-cases/melange/basic-install.t b/test/blackbox-tests/test-cases/melange/basic-install.t index f8cfc1e4f26e..b0fb0f2d2737 100644 --- a/test/blackbox-tests/test-cases/melange/basic-install.t +++ b/test/blackbox-tests/test-cases/melange/basic-install.t @@ -44,7 +44,7 @@ Test that we can install melange mode libraries (visibility public) (source (path Foo) (impl (path foo.ml)))))) - $ dune install --prefix prefix + $ dune install --prefix prefix --display short Installing prefix/lib/foo/META Installing prefix/lib/foo/dune-package Installing prefix/lib/foo/foo.ml diff --git a/test/blackbox-tests/test-cases/melange/depend-on-installed.t b/test/blackbox-tests/test-cases/melange/depend-on-installed.t index c832f0ab22cf..e98d9df9d284 100644 --- a/test/blackbox-tests/test-cases/melange/depend-on-installed.t +++ b/test/blackbox-tests/test-cases/melange/depend-on-installed.t @@ -21,7 +21,7 @@ Test dependency on installed package Entering directory 'a' Leaving directory 'a' - $ dune install --root a --prefix $PWD/prefix + $ dune install --root a --prefix $PWD/prefix --display short Installing $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/a.ml Installing $TESTCASE_ROOT/prefix/lib/a/dune-package diff --git a/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t b/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t index bbc4f6bf0bf5..e60ab96df515 100644 --- a/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t +++ b/test/blackbox-tests/test-cases/melange/emit-installed-two-modes.t @@ -21,7 +21,7 @@ Test dependency on installed package Entering directory 'a' Leaving directory 'a' - $ dune install --root a --prefix $PWD/prefix + $ dune install --root a --prefix $PWD/prefix --display short Installing $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/a.cma Installing $TESTCASE_ROOT/prefix/lib/a/a.cmi diff --git a/test/blackbox-tests/test-cases/melange/emit-installed.t b/test/blackbox-tests/test-cases/melange/emit-installed.t index 8c34bf4b0b4c..693419a128ab 100644 --- a/test/blackbox-tests/test-cases/melange/emit-installed.t +++ b/test/blackbox-tests/test-cases/melange/emit-installed.t @@ -26,7 +26,7 @@ Test dependency on installed package Entering directory 'lib-a' Leaving directory 'lib-a' - $ dune install --root lib-a --prefix $PWD/prefix + $ dune install --root lib-a --prefix $PWD/prefix --display short Installing $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/a.ml Installing $TESTCASE_ROOT/prefix/lib/a/dune-package diff --git a/test/blackbox-tests/test-cases/melange/emit-private.t b/test/blackbox-tests/test-cases/melange/emit-private.t index f312e869e7b1..9c1693620bdc 100644 --- a/test/blackbox-tests/test-cases/melange/emit-private.t +++ b/test/blackbox-tests/test-cases/melange/emit-private.t @@ -21,7 +21,7 @@ Test dependency on a private library in the same package as melange.emit $ dune build - $ dune install --prefix $PWD/prefix + $ dune install --prefix $PWD/prefix --display short Installing $TESTCASE_ROOT/prefix/lib/a/META Installing $TESTCASE_ROOT/prefix/lib/a/__private__/a/.public_cmi_melange/a.cmi Installing $TESTCASE_ROOT/prefix/lib/a/__private__/a/.public_cmi_melange/a.cmj diff --git a/test/blackbox-tests/test-cases/melange/gh7020.t b/test/blackbox-tests/test-cases/melange/gh7020.t index d6740a10cff0..c36694d85474 100644 --- a/test/blackbox-tests/test-cases/melange/gh7020.t +++ b/test/blackbox-tests/test-cases/melange/gh7020.t @@ -23,7 +23,7 @@ Reproduce github #7020 Entering directory '_to-install' Leaving directory '_to-install' $ cd $dir - $ dune install --root . --prefix _install + $ dune install --root . --prefix _install --display short Installing _install/lib/dummyfoo/META Installing _install/lib/dummyfoo/dummyfoo.ml Installing _install/lib/dummyfoo/dune-package 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 12c09f3fa742..b342dd9baeea 100644 --- a/test/blackbox-tests/test-cases/meta-template-version-bug.t +++ b/test/blackbox-tests/test-cases/meta-template-version-bug.t @@ -28,7 +28,7 @@ custom version: $ dune build @install - $ dune install --prefix ./_install 2>&1 | grep -v Installing + $ dune install --prefix ./_install [1] $ cat ./_install/lib/foobarlib/dune-package | \ diff --git a/test/blackbox-tests/test-cases/uninstall-mandir.t b/test/blackbox-tests/test-cases/uninstall-mandir.t index 8de7e6493b8c..808035e7ee56 100644 --- a/test/blackbox-tests/test-cases/uninstall-mandir.t +++ b/test/blackbox-tests/test-cases/uninstall-mandir.t @@ -35,7 +35,7 @@ Create a prefix ------------------------------------------------------------------------------- Install the project - $ dune install --prefix=install -p test test | dune_cmd sanitize + $ dune install --prefix=install -p test test --display short | dune_cmd sanitize Installing install/lib/test/META Installing install/lib/test/dune-package Installing install/lib/test/opam @@ -50,7 +50,7 @@ Simulate another tool being installed and creating some manpages in the prefix Uninstall the project; since the manpage directory contains pages from other tools, dune should not remove it, nor complain about it being non-empty. - $ dune uninstall --prefix=install -p test test | dune_cmd sanitize + $ dune uninstall --prefix=install --display short -p test test | dune_cmd sanitize Deleting install/lib/test/META Deleting install/lib/test/dune-package Deleting install/lib/test/opam diff --git a/test/blackbox-tests/test-cases/vendor/do-not-install-vendored-packages.t b/test/blackbox-tests/test-cases/vendor/do-not-install-vendored-packages.t index 5c1d0e837c3f..de4d1e831818 100644 --- a/test/blackbox-tests/test-cases/vendor/do-not-install-vendored-packages.t +++ b/test/blackbox-tests/test-cases/vendor/do-not-install-vendored-packages.t @@ -30,5 +30,5 @@ vendored package that shouldn't be installed. The following command should produce no output: - $ dune install --prefix _install 2>&1 | grep bar + $ dune install --prefix _install --display short 2>&1 | grep bar [1] diff --git a/test/blackbox-tests/test-cases/version-corruption.t b/test/blackbox-tests/test-cases/version-corruption.t index 321de1332b63..c1ac480b5504 100755 --- a/test/blackbox-tests/test-cases/version-corruption.t +++ b/test/blackbox-tests/test-cases/version-corruption.t @@ -97,7 +97,7 @@ shared buffer): $ rm -f gen_lifecycle.bc gen_lifecycle.exe && dune clean && dune build && ./gen_lifecycle.exe >/dev/null $ cp _build/default/gen_lifecycle.exe gen_lifecycle.old - $ dune install -j16 --prefix=./_install 2>/dev/null + $ dune install -j16 --prefix=./_install $ ./compare.sh _build/default/gen1.exe _install/bin/gen1 100 diff --git a/test/blackbox-tests/test-cases/write-permissions.t b/test/blackbox-tests/test-cases/write-permissions.t index 8bdca942fbda..65ca03bcfe43 100644 --- a/test/blackbox-tests/test-cases/write-permissions.t +++ b/test/blackbox-tests/test-cases/write-permissions.t @@ -51,7 +51,7 @@ Check that dune >= 2.4 removes target write permissions. Leaving directory '2.4' $ dune_cmd stat permissions 2.4/_build/default/foo.exe | head -c1 5 - $ dune install --root 2.4 --prefix ./ + $ dune install --root 2.4 --prefix ./ --display short Installing lib/foo/META Installing lib/foo/dune-package Installing bin/foo