From 80c53fe7d53234f6d56e8e4ba795d0a4de2d1f9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 10 Dec 2019 17:33:58 +0100 Subject: [PATCH] test: improve reporting a bit --- test/test-functions | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/test-functions b/test/test-functions index 827337a814..a7f28493ce 100644 --- a/test/test-functions +++ b/test/test-functions @@ -665,6 +665,9 @@ create_empty_image() { if [[ "$STRIP_BINARIES" = "no" ]]; then _size=$((4*_size)) fi + + echo "Setting up $TESTDIR/rootdisk.img (${_size} MB)" + rm -f "$TESTDIR/rootdisk.img" # Create the blank file to use as a root filesystem truncate -s "${_size}M" "$TESTDIR/rootdisk.img" @@ -1894,7 +1897,7 @@ test_cleanup() { } test_setup() { - if type -P meson && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then + if type -P meson >/dev/null && [[ "$(meson configure $BUILD_DIR | grep install-tests | awk '{ print $2 }')" != "true" ]]; then dfatal "Needs to be built with -Dinstall-tests=true" exit 1 fi