From 941a0734f22823f4502d86b0a8d7a6ecbe3db520 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Thu, 18 Jul 2024 13:44:40 +0200 Subject: [PATCH] qemu-test-init: remove BUILD_DIR_FULL There is no purpose on having one variable with a relative and one with an absolute path. Also simplify RAUC_TEST_NBD_SERVER. --- qemu-test-init | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/qemu-test-init b/qemu-test-init index 92fdf91c3..7effc1fe2 100755 --- a/qemu-test-init +++ b/qemu-test-init @@ -24,8 +24,7 @@ mount -t overlay overlay -o lowerdir=/etc,upperdir=/tmp/etc-overlay,workdir=/tmp # switch to rauc dir cd "$(dirname "$0")" -BUILD_DIR="build/" -BUILD_DIR_FULL="$(realpath build)/" +BUILD_DIR="$(realpath build)/" # parse cmdline for x in $(cat /proc/cmdline); do @@ -76,7 +75,7 @@ fi save_gcov_data () { if [ -n "$GCOV_PREFIX" ]; then - cp -r -T "$GCOV_PREFIX$BUILD_DIR_FULL" "$BUILD_DIR_FULL" || true + cp -r -T "$GCOV_PREFIX$BUILD_DIR" "$BUILD_DIR" || true fi } @@ -111,7 +110,7 @@ if [ -n "$SHELL" ]; then cp -a $BUILD_DIR/rauc /tmp/bin/rauc export PATH=/tmp/bin:$PATH fi -export RAUC_TEST_NBD_SERVER="$(realpath $BUILD_DIR/rauc)" +export RAUC_TEST_NBD_SERVER="$BUILD_DIR/rauc" if type losetup; then truncate --size=64M /tmp/rauc-disk.img