tests: extend TEST_NETLINK_OBJECT macro

[strace] / tests / net-accept-connect.c

diff --git a/tests/net-accept-connect.c b/tests/net-accept-connect.c
index 74419fac5e79e80156db84c1a4dc83380d5ef445..0050eeb49ea4ebe5bf8cbcb36c33e5a965c186e5 100644 (file)
--- a/tests/net-accept-connect.c
+++ b/tests/net-accept-connect.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2013-2016 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "tests.h"
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
@@ -61,17 +62,21 @@ main(int ac, const char **av)
        close(0);
        close(1);
 
-       assert(socket(PF_LOCAL, SOCK_STREAM, 0) == 0);
-       assert(bind(0, (struct sockaddr *) &addr, len) == 0);
-       assert(listen(0, 5) == 0);
+       if (socket(AF_UNIX, SOCK_STREAM, 0))
+               perror_msg_and_skip("socket");
+       if (bind(0, (struct sockaddr *) &addr, len))
+               perror_msg_and_skip("bind");
+       if (listen(0, 5))
+               perror_msg_and_skip("listen");
 
-       memset(&addr, 0, sizeof addr);
+       memset(&addr, 0, sizeof(addr));
        assert(getsockname(0, (struct sockaddr *) &addr, &len) == 0);
        if (len > sizeof(addr))
                len = sizeof(addr);
 
        pid_t pid = fork();
-       assert(pid >= 0);
+       if (pid < 0)
+               perror_msg_and_fail("fork");
 
        if (pid) {
                assert(accept(0, (struct sockaddr *) &addr, &len) == 1);
@@ -88,7 +93,7 @@ main(int ac, const char **av)
 
                assert(sigprocmask(SIG_BLOCK, &set, NULL) == 0);
                assert(signal(SIGUSR1, handler) != SIG_ERR);
-               assert(socket(PF_LOCAL, SOCK_STREAM, 0) == 1);
+               assert(socket(AF_UNIX, SOCK_STREAM, 0) == 1);
                assert(close(0) == 0);
                assert(connect(1, (struct sockaddr *) &addr, len) == 0);
                assert(sigprocmask(SIG_UNBLOCK, &set, NULL) == 0);