[PATCH v2 for-5.2] tests/9pfs: Mark "local" tests as "slow"

[PATCH v2 for-5.2] tests/9pfs: Mark "local" tests as "slow"

[Greg Kurz]

The "local" tests can fail on some automated build systems as
reported here:

https://lists.nongnu.org/archive/html/qemu-devel/2020-11/msg05510.html

This will need to be investigated and addressed later. Let's go for a
workaround in the meantime : mark the "local" tests as "slow" so that
they aren't executed with a simple "make check" like in the case above.

Reported-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Greg Kurz <groug@kaod.org>
---
v2: - less noisy patch
---
 tests/qtest/virtio-9p-test.c |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
index 21e340fa5f43..92a498f24925 100644
--- a/tests/qtest/virtio-9p-test.c
+++ b/tests/qtest/virtio-9p-test.c
@@ -1456,6 +1456,15 @@ static void register_virtio_9p_test(void)
 
 
     /* 9pfs test cases using the 'local' filesystem driver */
+
+    /*
+     * XXX: Until we are sure that these tests can run everywhere,
+     * keep them as "slow" so that they aren't run with "make check".
+     */
+    if (!g_test_slow()) {
+        return;
+    }
+
     opts.before = assign_9p_local_driver;
     qos_add_test("local/config", "virtio-9p", pci_config,  &opts);
     qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);

Re: [PATCH v2 for-5.2] tests/9pfs: Mark "local" tests as "slow"

[Thomas Huth]

On 24/11/2020 08.43, Greg Kurz wrote:
> The "local" tests can fail on some automated build systems as
> reported here:
> 
> https://lists.nongnu.org/archive/html/qemu-devel/2020-11/msg05510.html
> 
> This will need to be investigated and addressed later. Let's go for a
> workaround in the meantime : mark the "local" tests as "slow" so that
> they aren't executed with a simple "make check" like in the case above.
> 
> Reported-by: Cole Robinson <crobinso@redhat.com>
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> v2: - less noisy patch
> ---
>  tests/qtest/virtio-9p-test.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
> index 21e340fa5f43..92a498f24925 100644
> --- a/tests/qtest/virtio-9p-test.c
> +++ b/tests/qtest/virtio-9p-test.c
> @@ -1456,6 +1456,15 @@ static void register_virtio_9p_test(void)
>  
>  
>      /* 9pfs test cases using the 'local' filesystem driver */
> +
> +    /*
> +     * XXX: Until we are sure that these tests can run everywhere,
> +     * keep them as "slow" so that they aren't run with "make check".
> +     */
> +    if (!g_test_slow()) {
> +        return;
> +    }
> +
>      opts.before = assign_9p_local_driver;
>      qos_add_test("local/config", "virtio-9p", pci_config,  &opts);
>      qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);

Reviewed-by: Thomas Huth <thuth@redhat.com>

I assume you'll take this via the 9p tree? I don't have any other qtest
patches pending right now, so I did not plan to send another pull request
today...

Re: [PATCH v2 for-5.2] tests/9pfs: Mark "local" tests as "slow"

[Greg Kurz]

On Tue, 24 Nov 2020 08:54:38 +0100
Thomas Huth <thuth@redhat.com> wrote:

> On 24/11/2020 08.43, Greg Kurz wrote:
> > The "local" tests can fail on some automated build systems as
> > reported here:
> > 
> > https://lists.nongnu.org/archive/html/qemu-devel/2020-11/msg05510.html
> > 
> > This will need to be investigated and addressed later. Let's go for a
> > workaround in the meantime : mark the "local" tests as "slow" so that
> > they aren't executed with a simple "make check" like in the case above.
> > 
> > Reported-by: Cole Robinson <crobinso@redhat.com>
> > Signed-off-by: Greg Kurz <groug@kaod.org>
> > ---
> > v2: - less noisy patch
> > ---
> >  tests/qtest/virtio-9p-test.c |    9 +++++++++
> >  1 file changed, 9 insertions(+)
> > 
> > diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
> > index 21e340fa5f43..92a498f24925 100644
> > --- a/tests/qtest/virtio-9p-test.c
> > +++ b/tests/qtest/virtio-9p-test.c
> > @@ -1456,6 +1456,15 @@ static void register_virtio_9p_test(void)
> >  
> >  
> >      /* 9pfs test cases using the 'local' filesystem driver */
> > +
> > +    /*
> > +     * XXX: Until we are sure that these tests can run everywhere,
> > +     * keep them as "slow" so that they aren't run with "make check".
> > +     */
> > +    if (!g_test_slow()) {
> > +        return;
> > +    }
> > +
> >      opts.before = assign_9p_local_driver;
> >      qos_add_test("local/config", "virtio-9p", pci_config,  &opts);
> >      qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);
> 
> Reviewed-by: Thomas Huth <thuth@redhat.com>
> 
> I assume you'll take this via the 9p tree? I don't have any other qtest
> patches pending right now, so I did not plan to send another pull request
> today...
> 

Yeah, I plan to do that later today.

Cheers,

--
Greg

Re: [PATCH v2 for-5.2] tests/9pfs: Mark "local" tests as "slow"

[Christian Schoenebeck]

On Dienstag, 24. November 2020 08:43:43 CET Greg Kurz wrote:
> The "local" tests can fail on some automated build systems as
> reported here:
> 
> https://lists.nongnu.org/archive/html/qemu-devel/2020-11/msg05510.html
> 
> This will need to be investigated and addressed later. Let's go for a
> workaround in the meantime : mark the "local" tests as "slow" so that
> they aren't executed with a simple "make check" like in the case above.
> 
> Reported-by: Cole Robinson <crobinso@redhat.com>
> Signed-off-by: Greg Kurz <groug@kaod.org>
> ---
> v2: - less noisy patch
> ---
>  tests/qtest/virtio-9p-test.c |    9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/tests/qtest/virtio-9p-test.c b/tests/qtest/virtio-9p-test.c
> index 21e340fa5f43..92a498f24925 100644
> --- a/tests/qtest/virtio-9p-test.c
> +++ b/tests/qtest/virtio-9p-test.c
> @@ -1456,6 +1456,15 @@ static void register_virtio_9p_test(void)
> 
> 
>      /* 9pfs test cases using the 'local' filesystem driver */
> +
> +    /*
> +     * XXX: Until we are sure that these tests can run everywhere,
> +     * keep them as "slow" so that they aren't run with "make check".
> +     */
> +    if (!g_test_slow()) {
> +        return;
> +    }
> +
>      opts.before = assign_9p_local_driver;
>      qos_add_test("local/config", "virtio-9p", pci_config,  &opts);
>      qos_add_test("local/create_dir", "virtio-9p", fs_create_dir, &opts);

Given the short time frame left to 5.2 release, with grumbling though:

Acked-by: Christian Schoenebeck <qemu_oss@crudebyte.com>

Best regards,
Christian Schoenebeck