qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Thomas Huth" <thuth@redhat.com>,
	qemu-devel@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>,
	"Kevin Wolf" <kwolf@redhat.com>, "Max Reitz" <mreitz@redhat.com>,
	"Daniel P. Berrangé" <berrange@redhat.com>
Cc: Laurent Vivier <lvivier@redhat.com>,
	Christian Borntraeger <borntraeger@de.ibm.com>,
	qemu-block@nongnu.org
Subject: Re: [PATCH 4/6] tests/test-util-filemonitor: Skip test on non-x86 Travis containers
Date: Tue, 19 Nov 2019 18:31:17 +0100	[thread overview]
Message-ID: <d78b45e0-4011-afa2-0b11-8c7246e55364@redhat.com> (raw)
In-Reply-To: <20191119170822.45649-5-thuth@redhat.com>

On 11/19/19 6:08 PM, Thomas Huth wrote:
> test-util-filemonitor fails in restricted non-x86 Travis containers
> since they apparently blacklisted some required system calls there.
> Let's simply skip the test if we detect such an environment.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   tests/test-util-filemonitor.c | 11 +++++++++++
>   1 file changed, 11 insertions(+)
> 
> diff --git a/tests/test-util-filemonitor.c b/tests/test-util-filemonitor.c
> index 301cd2db61..45009c69f4 100644
> --- a/tests/test-util-filemonitor.c
> +++ b/tests/test-util-filemonitor.c
> @@ -406,10 +406,21 @@ test_file_monitor_events(void)
>       char *pathdst = NULL;
>       QFileMonitorTestData data;
>       GHashTable *ids = g_hash_table_new(g_int64_hash, g_int64_equal);
> +    char *travis_arch;
>   
>       qemu_mutex_init(&data.lock);
>       data.records = NULL;
>   
> +    /*
> +     * This test does not work on Travis LXD containers since some
> +     * syscalls are blocked in that environment.
> +     */
> +    travis_arch = getenv("TRAVIS_ARCH");
> +    if (travis_arch && !g_str_equal(travis_arch, "x86_64")) {
> +        g_test_skip("Test does not work on non-x86 Travis containers.");

We might need to refactor this hunk to a more generic place some day.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

> +        return;
> +    }
> +
>       /*
>        * The file monitor needs the main loop running in
>        * order to receive events from inotify. We must
> 



  reply	other threads:[~2019-11-19 17:33 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-19 17:08 [PATCH 0/6] Enable Travis builds on arm64, ppc64le and s390x Thomas Huth
2019-11-19 17:08 ` [PATCH 1/6] iotests: Skip test 060 if it is not possible to create large files Thomas Huth
2019-11-22 12:53   ` Alex Bennée
2019-11-19 17:08 ` [PATCH 2/6] iotests: Skip test 079 " Thomas Huth
2019-11-19 17:29   ` Philippe Mathieu-Daudé
2019-11-19 17:34     ` Thomas Huth
2019-11-19 17:38       ` Philippe Mathieu-Daudé
2019-11-19 17:50         ` Daniel P. Berrangé
2019-11-19 18:32           ` Thomas Huth
2019-11-22 12:57   ` Alex Bennée
2019-11-19 17:08 ` [PATCH 3/6] tests/hd-geo-test: Skip test when images can not be created Thomas Huth
2019-11-19 17:28   ` Philippe Mathieu-Daudé
2019-11-22 16:28   ` Alex Bennée
2019-11-19 17:08 ` [PATCH 4/6] tests/test-util-filemonitor: Skip test on non-x86 Travis containers Thomas Huth
2019-11-19 17:31   ` Philippe Mathieu-Daudé [this message]
2019-11-22 16:29   ` Alex Bennée
2019-11-19 17:08 ` [PATCH 5/6] travis.yml: drop 32 bit systems from MAIN_SOFTMMU_TARGETS Thomas Huth
2019-11-19 17:31   ` Philippe Mathieu-Daudé
2019-11-19 17:08 ` [PATCH 6/6] travis.yml: Enable builds on arm64, ppc64le and s390x Thomas Huth
2019-11-22 18:11   ` Alex Bennée
2019-11-22 23:09 ` [PATCH 0/6] Enable Travis " Alex Bennée
2019-11-25 10:28   ` Alex Bennée
2019-11-27  8:50     ` Thomas Huth
2019-12-04 14:03       ` Thomas Huth

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=d78b45e0-4011-afa2-0b11-8c7246e55364@redhat.com \
    --to=philmd@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=borntraeger@de.ibm.com \
    --cc=kwolf@redhat.com \
    --cc=lvivier@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=thuth@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).