| Message ID | 20191204154618.23560-6-thuth@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Enable Travis builds on arm64, ppc64le and s390x | expand |
On Wed, Dec 04, 2019 at 04:46:16PM +0100, 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. > > 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> > --- > 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 > Reviewed-by: Cleber Rosa <crosa@redhat.com> Tested-by: Cleber Rosa <crosa@redhat.com>
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