From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 10 Dec 2019 16:33:58 +0000 (+0100)
Subject: test: improve reporting a bit
X-Git-Tag: v246-rc1~682^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=80c53fe7d53234f6d56e8e4ba795d0a4de2d1f9e;p=thirdparty%2Fsystemd.git

test: improve reporting a bit
---

diff --git a/test/test-functions b/test/test-functions
index 827337a814b..a7f28493ce7 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