diff mbox series

[PULL,08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers

Message ID 20191219104934.866-9-alex.bennee@linaro.org
State Accepted
Commit 4f370b109876e0482d46dbe969f093d7ccf6269e
Headers show
Series testing and logging updates | expand

Commit Message

Alex Bennée Dec. 19, 2019, 10:49 a.m. UTC 
From: Thomas Huth <thuth@redhat.com>


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.

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

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

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

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>

Reviewed-by: Cleber Rosa <crosa@redhat.com>

Tested-by: Cleber Rosa <crosa@redhat.com>

Message-Id: <20191204154618.23560-6-thuth@redhat.com>

-- 
2.20.1
diff mbox series

Patch

diff --git a/tests/test-util-filemonitor.c b/tests/test-util-filemonitor.c
index 301cd2db619..45009c69f41 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.");
+        return;
+    }
+
     /*
      * The file monitor needs the main loop running in
      * order to receive events from inotify. We must