tests/9pfs: Force removing of local 9pfs test directory

gkurz · cschoenebeck · commit 603cc76a6069 · 2020-11-01T19:44:29.000+01:00
No need to get a complaint from "rm" if some path disappeared for some
reason.

Signed-off-by: Greg Kurz &lt;groug@kaod.org&gt;
Message-Id: &lt;160406199444.312256.8319835906008559151.stgit@bahia.lan&gt;
Signed-off-by: Christian Schoenebeck &lt;qemu_oss@crudebyte.com&gt;
diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c
@@ -67,7 +67,7 @@ void virtio_9p_create_local_test_dir(void)
 void virtio_9p_remove_local_test_dir(void)
 {
     g_assert(local_test_path != NULL);
-    char *cmd = g_strdup_printf("rm -r '%s'\n", local_test_path);
+    char *cmd = g_strdup_printf("rm -fr '%s'\n", local_test_path);
     int res = system(cmd);
     if (res < 0) {
         /* ignore error, dummy check to prevent compiler error */

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void virtio_9p_create_local_test_dir(void)`
`67`	`67`	`void virtio_9p_remove_local_test_dir(void)`
`68`	`68`	`{`
`69`	`69`	`g_assert(local_test_path != NULL);`
`70`		`- char *cmd = g_strdup_printf("rm -r '%s'\n", local_test_path);`
	`70`	`+ char *cmd = g_strdup_printf("rm -fr '%s'\n", local_test_path);`
`71`	`71`	`int res = system(cmd);`
`72`	`72`	`if (res < 0) {`
`73`	`73`	`/* ignore error, dummy check to prevent compiler error */`