From eae86a0be8546fbd50be4012eff0c404141302fa Mon Sep 17 00:00:00 2001 From: nojebar Date: Tue, 5 Apr 2022 08:49:12 +0200 Subject: [PATCH] Update tests Signed-off-by: nojebar --- .../test-cases/install-dry-run.t/run.t | 2 +- .../test-cases/install-libdir.t/run.t | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) 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 53f8136e8621..d4b86913c09d 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 @@ -59,4 +59,4 @@ Removing (if it exists) _install/lib/mylib/mylib.ml Removing (if it exists) _install/lib/mylib/opam Removing (if it exists) _install/lib/mylib/mylib.cmxs - Removing directory (if empty) _install/lib/mylib + Removing directory (warn if not empty) _install/lib/mylib diff --git a/test/blackbox-tests/test-cases/install-libdir.t/run.t b/test/blackbox-tests/test-cases/install-libdir.t/run.t index 87541b03fac8..4dc6c08d941c 100644 --- a/test/blackbox-tests/test-cases/install-libdir.t/run.t +++ b/test/blackbox-tests/test-cases/install-libdir.t/run.t @@ -165,11 +165,11 @@ If prefix is not passed, libdir defaults to the opam-prefix/lib directory: Removing (if it exists) /OPAM_PREFIX/man/a-man-page-with-no-ext Removing (if it exists) /OPAM_PREFIX/man/man1/a-man-page.1 Removing (if it exists) /OPAM_PREFIX/man/man3/another-man-page.3 - Removing directory (if empty) /OPAM_PREFIX/man/man3 - Removing directory (if empty) /OPAM_PREFIX/man/man1 - Removing directory (if empty) /OPAM_PREFIX/man - Removing directory (if empty) /OPAM_PREFIX/lib/foo - Removing directory (if empty) /OPAM_PREFIX/bin + Removing directory (warn if not empty) /OPAM_PREFIX/man/man3 + Removing directory (warn if not empty) /OPAM_PREFIX/man/man1 + Removing directory (warn if not empty) /OPAM_PREFIX/man + Removing directory (warn if not empty) /OPAM_PREFIX/lib/foo + Removing directory (warn if not empty) /OPAM_PREFIX/bin If only libdir is passed, binaries are installed under prefix/bin and libraries in libdir: @@ -251,11 +251,11 @@ in libdir: Removing (if it exists) /OPAM_PREFIX/man/a-man-page-with-no-ext Removing (if it exists) /OPAM_PREFIX/man/man1/a-man-page.1 Removing (if it exists) /OPAM_PREFIX/man/man3/another-man-page.3 - Removing directory (if empty) /OPAM_PREFIX/man/man3 - Removing directory (if empty) /OPAM_PREFIX/man/man1 - Removing directory (if empty) /OPAM_PREFIX/man - Removing directory (if empty) /OPAM_PREFIX/bin - Removing directory (if empty) /LIBDIR/foo + Removing directory (warn if not empty) /OPAM_PREFIX/man/man3 + Removing directory (warn if not empty) /OPAM_PREFIX/man/man1 + Removing directory (warn if not empty) /OPAM_PREFIX/man + Removing directory (warn if not empty) /OPAM_PREFIX/bin + Removing directory (warn if not empty) /LIBDIR/foo The DESTDIR var is supported. When set, it is prepended to the prefix. This is the case when the prefix is implicit: