From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Fam Zheng" <fam@euphon.net>, "Thomas Huth" <thuth@redhat.com>,
"Juan Quintela" <quintela@redhat.com>,
"Philippe Mathieu-Daudé" <philmd@redhat.com>,
"Cornelia Huck" <cohuck@redhat.com>,
"Dr. David Alan Gilbert" <dgilbert@redhat.com>,
"Peter Xu" <peterx@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>,
qemu-s390x@nongnu.org, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH 2/4] tests/test-util-sockets: Skip test on non-x86 Travis containers
Date: Tue, 17 Mar 2020 21:05:39 +0100 [thread overview]
Message-ID: <20200317200541.6246-3-philmd@redhat.com> (raw)
In-Reply-To: <20200317200541.6246-1-philmd@redhat.com>
Similarly to commit 4f370b1098, test-util-sockets 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: Philippe Mathieu-Daudé <philmd@redhat.com>
---
tests/test-util-sockets.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c
index 5fd947c7bf..046ebec8ba 100644
--- a/tests/test-util-sockets.c
+++ b/tests/test-util-sockets.c
@@ -231,11 +231,18 @@ static void test_socket_fd_pass_num_nocli(void)
int main(int argc, char **argv)
{
bool has_ipv4, has_ipv6;
+ char *travis_arch;
socket_init();
g_test_init(&argc, &argv, NULL);
+ travis_arch = getenv("TRAVIS_CPU_ARCH");
+ if (travis_arch && !g_str_equal(travis_arch, "x86_64")) {
+ g_printerr("Test does not work on non-x86 Travis containers.");
+ goto end;
+ }
+
/* We're creating actual IPv4/6 sockets, so we should
* check if the host running tests actually supports
* each protocol to avoid breaking tests on machines
--
2.21.1
next prev parent reply other threads:[~2020-03-17 20:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-17 20:05 [PATCH 0/4] travis-ci: Add a KVM-only s390x job Philippe Mathieu-Daudé
2020-03-17 20:05 ` [PATCH 1/4] tests/test-util-filemonitor: Fix Travis-CI $ARCH env variable name Philippe Mathieu-Daudé
2020-03-18 9:44 ` Daniel P. Berrangé
2020-03-17 20:05 ` Philippe Mathieu-Daudé [this message]
2020-03-18 9:45 ` [PATCH 2/4] tests/test-util-sockets: Skip test on non-x86 Travis containers Daniel P. Berrangé
2020-03-17 20:05 ` [PATCH 3/4] tests/migration: Disable autoconverge test on Travis-CI s390x Philippe Mathieu-Daudé
2020-03-17 20:26 ` Dr. David Alan Gilbert
2020-03-18 8:02 ` Philippe Mathieu-Daudé
2020-03-18 10:16 ` Dr. David Alan Gilbert
2020-03-17 20:05 ` [PATCH 4/4] .travis.yml: Add a KVM-only s390x job Philippe Mathieu-Daudé
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=20200317200541.6246-3-philmd@redhat.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=dgilbert@redhat.com \
--cc=fam@euphon.net \
--cc=pasic@linux.ibm.com \
--cc=peterx@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=quintela@redhat.com \
--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).