[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis co
From: |
Alex Bennée |
Subject: |
[PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers |
Date: |
Thu, 19 Dec 2019 10:49:17 +0000 |
From: Thomas Huth <address@hidden>
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>
Signed-off-by: Alex Bennée <address@hidden>
Reviewed-by: Cleber Rosa <address@hidden>
Tested-by: Cleber Rosa <address@hidden>
Message-Id: <address@hidden>
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
--
2.20.1
- [PULL 00/25] testing and logging updates, Alex Bennée, 2019/12/19
- [PULL 01/25] configure: allow disable of cross compilation containers, Alex Bennée, 2019/12/19
- [PULL 03/25] travis.yml: Run tcg tests with tci, Alex Bennée, 2019/12/19
- [PULL 02/25] tests/vm: Allow to set qemu-img path, Alex Bennée, 2019/12/19
- [PULL 04/25] iotests: Provide a function for checking the creation of huge files, Alex Bennée, 2019/12/19
- [PULL 05/25] iotests: Skip test 060 if it is not possible to create large files, Alex Bennée, 2019/12/19
- [PULL 06/25] iotests: Skip test 079 if it is not possible to create large files, Alex Bennée, 2019/12/19
- [PULL 08/25] tests/test-util-filemonitor: Skip test on non-x86 Travis containers,
Alex Bennée <=
- [PULL 09/25] travis.yml: Enable builds on arm64, ppc64le and s390x, Alex Bennée, 2019/12/19
- [PULL 07/25] tests/hd-geo-test: Skip test when images can not be created, Alex Bennée, 2019/12/19
- [PULL 10/25] ci: build out-of-tree, Alex Bennée, 2019/12/19
- [PULL 11/25] Fix double free issue in qemu_set_log_filename()., Alex Bennée, 2019/12/19
- [PULL 12/25] Cleaned up flow of code in qemu_set_log(), to simplify and clarify., Alex Bennée, 2019/12/19
- [PULL 13/25] Add a mutex to guarantee single writer to qemu_logfile handle., Alex Bennée, 2019/12/19
- [PULL 18/25] travis.yml: Remove the redundant clang-with-MAIN_SOFTMMU_TARGETS entry, Alex Bennée, 2019/12/19
- [PULL 21/25] linux-user: add target_mmap_complete tracepoint, Alex Bennée, 2019/12/19
- [PULL 15/25] Add use of RCU for qemu_logfile., Alex Bennée, 2019/12/19
- [PULL 20/25] linux-user: convert target_mmap debug to tracepoint, Alex Bennée, 2019/12/19