]> granicus.if.org Git - strace/commitdiff
tests: skip ip network tests when the network is not functional
authorDmitry V. Levin <ldv@altlinux.org>
Wed, 14 Jan 2015 11:32:38 +0000 (11:32 +0000)
committerDmitry V. Levin <ldv@altlinux.org>
Wed, 14 Jan 2015 11:37:40 +0000 (11:37 +0000)
* 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.

tests/inet-accept-connect-send-recv.c
tests/net-yy.test

index 38376aed4398cca3e1aec091f0294b03eb772445..7cd079ffb3ab47ecfb86fca1be15a72aefa5afa9 100644 (file)
@@ -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));
index 85c2ede2a25505aa32fc5af8b1319a29e63957d7..8e6118a433d1b04add45f1df41b218dd59526d13 100755 (executable)
@@ -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