[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis
From: |
Thomas Huth |
Subject: |
[PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis containers |
Date: |
Wed, 4 Dec 2019 16:46:16 +0100 |
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é <address@hidden>
Reviewed-by: Alex Bennée <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
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.");
+ return;
+ }
+
/*
* The file monitor needs the main loop running in
* order to receive events from inotify. We must
--
2.18.1
- Re: [PATCH v2 2/7] iotests: Skip test 060 if it is not possible to create large files, (continued)
- [PATCH v2 4/7] tests/hd-geo-test: Skip test when images can not be created, Thomas Huth, 2019/12/04
- [PATCH v2 3/7] iotests: Skip test 079 if it is not possible to create large files, Thomas Huth, 2019/12/04
- [PATCH v2 7/7] travis.yml: Enable builds on arm64, ppc64le and s390x, Thomas Huth, 2019/12/04
- [PATCH v2 6/7] configure: allow disable of cross compilation containers, Thomas Huth, 2019/12/04
- [PATCH v2 5/7] tests/test-util-filemonitor: Skip test on non-x86 Travis containers,
Thomas Huth <=
- Re: [PATCH v2 0/7] Enable Travis builds on arm64, ppc64le and s390x, Cleber Rosa, 2019/12/04