[PATCH 1/1] tests: Correct netboot and file_filter test failure

From: Andrew Hamilton <adhamilt@gmail.com>
To: grub-devel@gnu.org
Cc: daniel.kiper@oracle.com, Andrew Hamilton <adhamilt@gmail.com>
Subject: [PATCH 1/1] tests: Correct netboot and file_filter test failure
Date: Sat, 21 Jun 2025 10:50:38 -0500	[thread overview]
Message-ID: <20250621155038.146060-2-adhamilt@gmail.com> (raw)
In-Reply-To: <20250621155038.146060-1-adhamilt@gmail.com>

Correct a test failure in netboot_test and file_filter_test
caused by an issue cleaning up the tmp directory created
for netboot. Netboot creates a subdirectory in the tmp
folder that causes the rmdir to fail - so cleanup the
subdirectory first.

Fixes: 1d59f39b5f1b ("tests/util/grub-shell: Remove the
work directory on successful run and debug is not on")

Signed-off-by: Andrew Hamilton <adhamilt@gmail.com>
---
 tests/util/grub-shell.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 8baa3667a..2a874a85d 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -711,6 +711,9 @@ elif [ x$boot = xemu ]; then
     test -n "$debug" || rm -rf "$rootdir"
     test -n "$debug" || rm -f "$roottar"
 fi
+if [ x$boot = xnet ]; then
+    test -n "$debug" || rm -rf "$work_directory/netdir"
+fi
 test -n "$debug" || rm -f "${isofile}"
 test -n "$debug" || rm -rf "${rom_directory}"
 test -n "$debug" || rm -f "${tmpfile}" "${cfgfile}" "${goutfile}"
-- 
2.39.5


_______________________________________________
Grub-devel mailing list
Grub-devel@gnu.org
https://lists.gnu.org/mailman/listinfo/grub-devel
