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

[PATCH] tests/9pfs: Force removing of local 9pfs test directory

Greg Kurz posted 1 patch 3 years, 6 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/160406199444.312256.8319835906008559151.stgit@bahia.lan

Maintainers: Laurent Vivier <lvivier@redhat.com>, Thomas Huth <thuth@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>

tests/qtest/libqos/virtio-9p.c |    2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[PATCH] tests/9pfs: Force removing of local 9pfs test directory

Posted by Greg Kurz 3 years, 6 months ago

No need to get a complaint from "rm" if some path disappeared for some
reason.

Signed-off-by: Greg Kurz <groug@kaod.org>
---

I remember seeing a "rm: cannot remove 'some-path': No such file or directory"
recently but I can't reproduce it with current master :)
---
 tests/qtest/libqos/virtio-9p.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c
index 6b22fa0e9a49..ab9d88a9b7de 100644
--- a/tests/qtest/libqos/virtio-9p.c
+++ b/tests/qtest/libqos/virtio-9p.c
@@ -62,7 +62,7 @@ static void create_local_test_dir(void)
 static void 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 */

Re: [PATCH] tests/9pfs: Force removing of local 9pfs test directory

Posted by Christian Schoenebeck 3 years, 6 months ago

On Freitag, 30. Oktober 2020 13:46:34 CET Greg Kurz wrote:
> No need to get a complaint from "rm" if some path disappeared for some
> reason.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> 
> I remember seeing a "rm: cannot remove 'some-path': No such file or
> directory" recently but I can't reproduce it with current master :)
> ---
>  tests/qtest/libqos/virtio-9p.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/qtest/libqos/virtio-9p.c b/tests/qtest/libqos/virtio-9p.c
> index 6b22fa0e9a49..ab9d88a9b7de 100644
> --- a/tests/qtest/libqos/virtio-9p.c
> +++ b/tests/qtest/libqos/virtio-9p.c
> @@ -62,7 +62,7 @@ static void create_local_test_dir(void)
>  static void 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 */

Makes sense, and trivial enough to put it into v2 PR.

Queued on 9p.next:
https://github.com/cschoenebeck/qemu/commits/9p.next

Thanks!

Best regards,
Christian Schoenebeck