From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from list by lists.gnu.org with archive (Exim 4.90_1) id 1pOSry-00061B-9L for mharc-grub-devel@gnu.org; Sat, 04 Feb 2023 19:26:58 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOSrw-00060z-LF for grub-devel@gnu.org; Sat, 04 Feb 2023 19:26:56 -0500 Received: from mail-qt1-x831.google.com ([2607:f8b0:4864:20::831]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOSrv-0001eF-0A for grub-devel@gnu.org; Sat, 04 Feb 2023 19:26:56 -0500 Received: by mail-qt1-x831.google.com with SMTP id g7so9454934qto.11 for ; Sat, 04 Feb 2023 16:26:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=efficientek-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=SgC4DTBhu8I6cSSrQQihMI/Hl3FV7/qusP7yiDbFh8g=; b=USYqhUfHdcl6gXgEUsk3zopZeOz8mWBuoFsEUOhqq94ZrzdjgPfK5XeZodlccj1TG6 s6lIH7pLK1tnqRTZAF7luYf1/PTfyON1KX0mW2EUARRavJxXQa55EZqh0PBltp8lAS21 nxcDKjORR91R/Z45ulY4AUTX8pgMN+PDSwt5h3lL0BZhaw6idP0xzW7X4Zad2WixR5K3 /AvZ4zyz0swVsNw0/Fk/PhO9xVQthQ1xXn/ExYcRFIgRUKmguA3pJOKCKtq2PBVKWLXX /SDSY/HEnp/Zpf4cEj36JcNxts7w5nFUGi7DxsytFc2bFlo+rY36L9nH6va0BhTa/hF3 hCrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=SgC4DTBhu8I6cSSrQQihMI/Hl3FV7/qusP7yiDbFh8g=; b=DEroOGIEPBWUq+Se5c78LcW326t75esbhca360U6B6MwOrKZ8gVAj/oiRcgn2YGbuh hV0oYKu6ka47FfeY+3101t/432Muv7S6d12Ani8lwHAOpLK3D2mkMx5w3HMz41AOlXJZ mUrdivq8rVHjkOCEU7H7VKRrxW6Zklj1YglqrSREIZBKsP1HcK3CdzEwPX2WSotCwvm7 fPbQBWHZ3pRb8cabUhDBXG6uW9p4kvjBuXeJlOBTrxltKN6/kEPOAhgPR213BzyCciF7 q2xOZeFCLdgVRrxky7C7MIGtBLK4lPLvPQthgp35dK5d/ORsl+1c39LgTkrLic/8J8re V+AA== X-Gm-Message-State: AO0yUKVFA0z/t3WMembkpBNLxlb4tiX8mAuOcFsKjrNCY8JopIYSO9br fK9RbxpiFGYCoJVbSvZv8EDIRv+Y+j1Do9eZ X-Google-Smtp-Source: AK7set8nwQO8/jFZNhSUaJwGk7VGppyg32XWbtkg1O1CxPuBQIL/yO0uJ2OnCj083zHQWT4gFb+fjA== X-Received: by 2002:ac8:5ac3:0:b0:3b8:63c6:831d with SMTP id d3-20020ac85ac3000000b003b863c6831dmr24169273qtd.42.1675556813444; Sat, 04 Feb 2023 16:26:53 -0800 (PST) Received: from localhost.localdomain ([37.218.244.251]) by smtp.gmail.com with ESMTPSA id fg11-20020a05622a580b00b003b63b8df24asm4438964qtb.36.2023.02.04.16.26.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 16:26:52 -0800 (PST) From: Glenn Washburn To: grub-devel@gnu.org, Daniel Kiper Cc: Glenn Washburn Subject: [PATCH] tests/util/grub-fs-tester: Use shell variable instead of autoconf Date: Sat, 4 Feb 2023 18:26:07 -0600 Message-Id: <20230205002607.1940581-2-development@efficientek.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230205002607.1940581-1-development@efficientek.com> References: <20230205002607.1940581-1-development@efficientek.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::831; envelope-from=development@efficientek.com; helo=mail-qt1-x831.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: grub-devel@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: The development of GNU GRUB List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Feb 2023 00:26:56 -0000 By using a shell variable that is set once by the expansion of an autoconf variable, the resulting script is more readable. Signed-off-by: Glenn Washburn --- tests/util/grub-fs-tester.in | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in index 63a38ec2bb..fd500ff8a0 100644 --- a/tests/util/grub-fs-tester.in +++ b/tests/util/grub-fs-tester.in @@ -10,6 +10,7 @@ unset SOURCE_DATE_EPOCH fs="$1" +builddir="@builddir@" GRUBFSTEST="@builddir@/grub-fstest" GRUBPROBE="@builddir@/grub-probe" @@ -1046,18 +1047,18 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do # OS LIMITATION: No AFS support under GNU/Linux mkdir "$MNTPOINTRW/$OSDIR/sdir" mkdir -p "$MNTPOINTRW/$OSDIR/$PDIR" - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/sdir/2.img" - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$BASEFILE" - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$NASTYFILE" - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$IFILE" - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$LONGNAME" - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$PDIR/$PFIL" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/sdir/2.img" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$BASEFILE" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$NASTYFILE" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$IFILE" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$LONGNAME" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/$PDIR/$PFIL" if [ $PDIR != $PDIR2 ]; then - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/${PDIR2}/$PFIL" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/${PDIR2}/$PFIL" fi - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/CaSe" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/CaSe" if [ x$CASESENS = xy ]; then - "@builddir@"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/cAsE" + "$builddir"/garbage-gen $BLOCKCNT > "$MNTPOINTRW/$OSDIR/cAsE" fi if (test x$fs = xvfat12a || test x$fs = xmsdos12a) && test x$BLKSIZE = x131072; then # With this config there isn't enough space for full copy. -- 2.34.1