test: improve reporting a bit

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2019-12-10 17:33:58 +01:00
parent 70ce817ccb
commit 80c53fe7d5
1 changed files with 4 additions and 1 deletions

View File

@ -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