[PATCH] tests/util/grub-fs-tester: Remove unused variable

[PATCH] tests/util/grub-fs-tester: Remove unused variable

[Glenn Washburn]

Signed-off-by: Glenn Washburn <development@efficientek.com>
---
 tests/util/grub-fs-tester.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/util/grub-fs-tester.in b/tests/util/grub-fs-tester.in
index fd500ff8a0..064464eb2d 100644
--- a/tests/util/grub-fs-tester.in
+++ b/tests/util/grub-fs-tester.in
@@ -654,7 +654,6 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
 	    PFIL="p.img"
 
 	    unset LODEVICES
-	    GENERATED=n
 	    LODEVICES=
 	    MOUNTDEVICE=
 	    
@@ -665,7 +664,6 @@ for LOGSECSIZE in $(range "$MINLOGSECSIZE" "$MAXLOGSECSIZE" 1); do
 		    | xrockridge_joliet_1999)
 		    MNTPOINTRW="$MASTER"
 		    MNTPOINTRO="$MASTER"
-		    GENERATED=y
 		    mkdir -p "$MASTER";;
 		    # No mkfs for GNU/Linux. Just unpack preformatted empty image
 		*)
-- 
2.34.1

[PATCH] tests/util/grub-fs-tester: Use shell variable instead of autoconf

[Glenn Washburn]

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 <development@efficientek.com>
---
 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

Re: [PATCH] tests/util/grub-fs-tester: Remove unused variable

[Daniel Kiper]

On Sat, Feb 04, 2023 at 06:26:06PM -0600, Glenn Washburn wrote:
> Signed-off-by: Glenn Washburn <development@efficientek.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel

Re: [PATCH] tests/util/grub-fs-tester: Use shell variable instead of autoconf

[Daniel Kiper]

On Sat, Feb 04, 2023 at 06:26:07PM -0600, Glenn Washburn wrote:
> 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 <development@efficientek.com>

Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

Daniel