From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 14 Jan 2015 11:32:38 +0000 (+0000)
Subject: tests: skip ip network tests when the network is not functional
X-Git-Tag: v4.10~192
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=552bc3a09ae1e40773a4de2713ca45710c0e3c4e;p=strace

tests: skip ip network tests when the network is not functional

* tests/inet-accept-connect-send-recv.c (main): Return 77 if inet stream
socket cannot be created or it cannot be bound to INADDR_LOOPBACK.
* tests/net-yy.test: Skip the test if inet-accept-connect-send-recv
returns 77.
---

diff --git a/tests/inet-accept-connect-send-recv.c b/tests/inet-accept-connect-send-recv.c
index 38376aed..7cd079ff 100644
--- a/tests/inet-accept-connect-send-recv.c
+++ b/tests/inet-accept-connect-send-recv.c
@@ -1,5 +1,6 @@
 #include <assert.h>
 #include <stddef.h>
+#include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/wait.h>
@@ -22,8 +23,14 @@ int main(void)
 	close(0);
 	close(1);
 
-	assert(socket(PF_INET, SOCK_STREAM, 0) == 0);
-	assert(bind(0, (struct sockaddr *) &addr, len) == 0);
+	if (socket(PF_INET, SOCK_STREAM, 0)) {
+		perror("socket");
+		return 77;
+	}
+	if (bind(0, (struct sockaddr *) &addr, len)) {
+		perror("bind");
+		return 77;
+	}
 	assert(listen(0, 5) == 0);
 
 	memset(&addr, 0, sizeof(addr));
diff --git a/tests/net-yy.test b/tests/net-yy.test
index 85c2ede2..8e6118a4 100755
--- a/tests/net-yy.test
+++ b/tests/net-yy.test
@@ -13,8 +13,13 @@ check_prog sed
 
 rm -f $LOG.* $LOG-*
 
-./inet-accept-connect-send-recv ||
-	fail_ 'inet-accept-connect-send-recv failed'
+./inet-accept-connect-send-recv || {
+	if [ $? -eq 77 ]; then
+		framework_skip_ 'PF_INET SOCK_STREAM is not available'
+	else
+		fail_ 'inet-accept-connect-send-recv failed'
+	fi
+}
 
 ./netlink_inet_diag || {
 	if [ $? -eq 77 ]; then