From 71154d836292f94e474cdf2ac942a08be4f8243b Mon Sep 17 00:00:00 2001 From: Rob Bradford Date: Fri, 16 Aug 2019 14:35:41 +0100 Subject: [PATCH] tests: Use "-f" on directory rm commands When running the script from an interactive environment there are always some files inside the git directory that rm prompts to delete so instead pass "-f" to avoid that. Signed-off-by: Rob Bradford --- scripts/run_integration_tests.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/run_integration_tests.sh b/scripts/run_integration_tests.sh index 113d6f637..920802694 100755 --- a/scripts/run_integration_tests.sh +++ b/scripts/run_integration_tests.sh @@ -74,7 +74,7 @@ if [ ! -f "$VMLINUX_IMAGE" ]; then cp vmlinux $VMLINUX_IMAGE cp arch/x86/boot/bzImage $BZIMAGE_IMAGE popd - rm -r $LINUX_CUSTOM_DIR + rm -rf $LINUX_CUSTOM_DIR popd fi @@ -88,7 +88,7 @@ if [ ! -f "$VIRTIOFSD" ]; then make virtiofsd -j `nproc` cp virtiofsd $VIRTIOFSD popd - rm -r $VIRTIOFSD_DIR + rm -rf $VIRTIOFSD_DIR sudo setcap cap_sys_admin+epi "virtiofsd" popd fi