Sort expected getaddrinfo output in inet4 inet6 order, then the

test passes.

2 files changed, 37 insertions, 46 deletions

diff --git a/src/regress/lib/libc/getaddrinfo/Makefile b/src/regress/lib/libc/getaddrinfo/Makefile
index d93494cc1c..7a78438a12 100644
--- a/src/regress/lib/libc/getaddrinfo/Makefile
+++ b/src/regress/lib/libc/getaddrinfo/Makefile
@@ -1,19 +1,10 @@
-#       $OpenBSD: Makefile,v 1.4 2011/07/07 21:00:59 deraadt Exp $
+#       $OpenBSD: Makefile,v 1.5 2017/07/27 17:43:24 bluhm Exp $
 
-PROG=           gaitest
-SRCS=           gaitest.c
-NOMAN=          # defined
-CLEANFILES+=    out
+PROG =          gaitest
+CLEANFILES =    out
 
-REGRESS_TARGETS=do-test
-
-do-test: ${PROG}
+run-regress-${PROG}: ${PROG}
         sh ${.CURDIR}/testsuite.sh >out 2>&1
-        @if diff -u10 out ${.CURDIR}/answer; then \
-                echo SUCCESS; \
-        else \
-                echo FAIL; \
-                exit 1; \
-        fi
+        diff -u10 out ${.CURDIR}/answer
 
 .include <bsd.regress.mk>
diff --git a/src/regress/lib/libc/getaddrinfo/answer b/src/regress/lib/libc/getaddrinfo/answer
index 778fc64baa..af6d069bbe 100644
--- a/src/regress/lib/libc/getaddrinfo/answer
+++ b/src/regress/lib/libc/getaddrinfo/answer
@@ -21,8 +21,8 @@ ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
 ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv echo
 ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
-ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
-ai3: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
+ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
 ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7
 
 == specific address family
@@ -33,43 +33,43 @@ ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
 
 == empty hostname
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
+ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7
-ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
-ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 7
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 7
+ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 7
+ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 7
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69
-ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 69
+ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 69
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80
-ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-ai3: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80
-ai4: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
+ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80
+ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv http
-ai1: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80
-ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80
+ai1: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80
+ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv echo
-ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 7
-ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 7
-ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 7
-ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 7
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 7
+ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 7
+ai3: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 7
+ai4: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 7
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv tftp
-ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 69
-ai2: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 69
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 69
+ai2: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 69
 arg: flags 0x3 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 80
-ai2: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80
-ai3: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 80
-ai4: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80
+ai1: flags 0x3 family 2 socktype 2 protocol 17 addrlen 16 host 0.0.0.0 serv 80
+ai2: flags 0x3 family 2 socktype 1 protocol 6 addrlen 16 host 0.0.0.0 serv 80
+ai3: flags 0x3 family 24 socktype 2 protocol 17 addrlen 28 host :: serv 80
+ai4: flags 0x3 family 24 socktype 1 protocol 6 addrlen 28 host :: serv 80
 arg: flags 0x2 family 0 socktype 1 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
-ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
+ai1: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 80
+ai2: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 80
 arg: flags 0x2 family 0 socktype 2 protocol 0 addrlen 0 host (empty) serv 80
-ai1: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80
-ai2: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80
+ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 80
+ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 80
 
 == empty servname
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host ::1 serv (empty)
@@ -80,8 +80,8 @@ ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
 ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host localhost serv (empty)
 ai1: flags 0x2 family 2 socktype 2 protocol 17 addrlen 16 host 127.0.0.1 serv 0
-ai2: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
-ai3: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
+ai2: flags 0x2 family 2 socktype 1 protocol 6 addrlen 16 host 127.0.0.1 serv 0
+ai3: flags 0x2 family 24 socktype 2 protocol 17 addrlen 28 host ::1 serv 0
 ai4: flags 0x2 family 24 socktype 1 protocol 6 addrlen 28 host ::1 serv 0
 arg: flags 0x2 family 0 socktype 0 protocol 0 addrlen 0 host (empty) serv (empty)
 name or service is not known