tests/util/grub-shell: Correct netboot and file_filter test failure
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> Tested-by: Leo Sandoval <lsandova@redhat.com> Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
parent
8c2d4e64ff
commit
2539ede82a
@ -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}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user