1 files changed, 49 insertions, 66 deletions

diff --git a/tools/regression/sockets/accf_data_attach/accf_data_attach.c b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
index 203b3e7f46501..ccf8d5523d0b5 100644
--- a/tools/regression/sockets/accf_data_attach/accf_data_attach.c
+++ b/tools/regression/sockets/accf_data_attach/accf_data_attach.c
@@ -63,12 +63,15 @@ main(int argc, char *argv[])
 	socklen_t len;
 	int lso, ret;
 
+	printf("1..9\n");
+
 	/*
 	 * Step 0. Open socket().
 	 */
 	lso = socket(PF_INET, SOCK_STREAM, 0);
 	if (lso == -1)
-		err(1, "socket");
+		errx(-1, "not ok 1 - socket: %s", strerror(errno));
+	printf("ok 1 - socket\n");
 
 	/*
 	 * Step 1. After socket().  Should return EINVAL, since no accept
@@ -77,16 +80,12 @@ main(int argc, char *argv[])
 	bzero(&afa, sizeof(afa));
 	len = sizeof(afa);
 	ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
-	if (ret != -1) {
-		fprintf(stderr, "FAIL: getsockopt() after socket() "
-		    "succeeded\n");
-		exit(-1);
-	}
-	if (errno != EINVAL) {
-		fprintf(stderr, "FAIL: getsockopt() after socket() "
-		    "failed with %d (%s)\n", errno, strerror(errno));
-		exit(-1);
-	}
+	if (ret != -1)
+		errx(-1, "not ok 2 - getsockopt() after socket() succeeded");
+	if (errno != EINVAL)
+		errx(-1, "not ok 2 - getsockopt() after socket() failed with "
+		    "%d (%s)", errno, strerror(errno));
+	printf("ok 2 - getsockopt\n");
 
 	/*
 	 * Step 2. Bind().  Ideally this will succeed.
@@ -97,7 +96,8 @@ main(int argc, char *argv[])
 	sin.sin_port = htons(8080);
 	sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
 	if (bind(lso, (struct sockaddr *)&sin, sizeof(sin)) < 0)
-		err(1, "bind");
+		errx(-1, "not ok 3 - bind %s", strerror(errno));
+	printf("ok 3 - bind\n");
 
 	/*
 	 * Step 3: After bind().  getsockopt() should return EINVAL, since no
@@ -105,15 +105,12 @@ main(int argc, char *argv[])
 	 */
 	len = sizeof(afa);
 	ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
-	if (ret != -1) {
-		fprintf(stderr, "FAIL: getsockopt() after bind() succeeded\n");
-		exit(-1);
-	}
-	if (errno != EINVAL) {
-		fprintf(stderr, "FAIL: getsockopt() after bind() failed "
-		    "with %d (%s)\n", errno, strerror(errno));
-		exit(-1);
-	}
+	if (ret != -1)
+		errx(-1, "not ok 4 - getsockopt() after bind() succeeded");
+	if (errno != EINVAL)
+		errx(-1, "not ok 4 -  getsockopt() after bind() failed with %d (%s)",
+		    errno, strerror(errno));
+	printf("ok 4 - getsockopt\n");
 
 	/*
 	 * Step 4: Setsockopt() before listen().  Should fail, since it's not
@@ -122,11 +119,9 @@ main(int argc, char *argv[])
 	bzero(&afa, sizeof(afa));
 	strcpy(afa.af_name, ACCF_NAME);
 	ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
-	if (ret == 0) {
-		fprintf(stderr, "FAIL: setsockopt() before listen() "
-		    "succeeded\n");
-		exit(-1);
-	}
+	if (ret == 0)
+		errx(-1, "not ok 5 - setsockopt() before listen() succeeded");
+	printf("ok 5 - setsockopt\n");
 
 	/*
 	 * Step 5: Getsockopt() after pre-listen() setsockopt().  Should
@@ -134,22 +129,20 @@ main(int argc, char *argv[])
 	 */
 	len = sizeof(afa);
 	ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
-	if (ret == 0) {
-		fprintf(stderr, "FAIL: getsockopt() after pre-listen() "
-		    "setsockopt() succeeded\n");
-		exit(-1);
-	}
-	if (errno != EINVAL) {
-		fprintf(stderr, "FAIL: pre-listen() getsockopt() failed "
-		    "with %d (%s)\n", errno, strerror(errno));
-		exit(-1);
-	}
+	if (ret == 0)
+		errx(-1, "not ok 6 - getsockopt() after pre-listen() setsockopt() "
+		    "succeeded");
+	if (errno != EINVAL)
+		errx(-1, "not ok 6 - pre-listen() getsockopt() failed with %d (%s)",
+		    errno, strerror(errno));
+	printf("ok 6 - getsockopt\n");
 
 	/*
 	 * Step 6: listen().
 	 */
 	if (listen(lso, -1) < 0)
-		err(1, "listen");
+		errx(-1, "not ok 7 - listen: %s", strerror(errno));
+	printf("ok 7 - listen\n");
 
 	/*
 	 * Step 7: After listen().  This call to setsockopt() should succeed.
@@ -157,16 +150,13 @@ main(int argc, char *argv[])
 	bzero(&afa, sizeof(afa));
 	strcpy(afa.af_name, ACCF_NAME);
 	ret = setsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, sizeof(afa));
-	if (ret != 0) {
-		fprintf(stderr, "FAIL: setsockopt() after listen() failed "
-		    "with %d (%s)\n", errno, strerror(errno));
-		exit(-1);
-	}
-	if (len != sizeof(afa)) {
-		fprintf(stderr, "FAIL: setsockopt() after listen() returned "
-		    "wrong size (%d vs expected %d)\n", len, sizeof(afa));
-		exit(-1);
-	}
+	if (ret != 0)
+		errx(-1, "not ok 8 - setsockopt() after listen() failed with %d "
+		    "(%s)", errno, strerror(errno));
+	if (len != sizeof(afa))
+		errx(-1, "not ok 8 - setsockopt() after listen() returned wrong "
+		    "size (%d vs expected %d)", len, sizeof(afa));
+	printf("ok 8 - setsockopt\n");
 
 	/*
 	 * Step 8: After setsockopt().  Should succeed and identify
@@ -175,26 +165,19 @@ main(int argc, char *argv[])
 	bzero(&afa, sizeof(afa));
 	len = sizeof(afa);
 	ret = getsockopt(lso, SOL_SOCKET, SO_ACCEPTFILTER, &afa, &len);
-	if (ret != 0) {
-		fprintf(stderr, "FAIL: getsockopt() after listen() "
-		    "setsockopt() failed with %d (%s)\n", errno,
-		    strerror(errno));
-		exit(-1);
-	}
-	if (len != sizeof(afa)) {
-		fprintf(stderr, "FAIL: getsockopt() after setsockopet() "
-		    " after listen() returned wrong size (got %d expected "
-		    "%d)\n", len, sizeof(afa));
-		exit(-1);
-	}
-	if (strcmp(afa.af_name, ACCF_NAME) != 0) {
-		fprintf(stderr, "FAIL: getsockopt() after setsockopt() "
-		    "after listen() mismatch (got %s expected %s)\n",
-		    afa.af_name, ACCF_NAME);
-		exit(-1);
-	}
+	if (ret != 0)
+		errx(-1, "not ok 9 - getsockopt() after listen() setsockopt() "
+		    "failed with %d (%s)", errno, strerror(errno));
+	if (len != sizeof(afa))
+		errx(-1, "not ok 9 - getsockopt() after setsockopet()  after "
+		    "listen() returned wrong size (got %d expected %d)", len,
+		    sizeof(afa));
+	if (strcmp(afa.af_name, ACCF_NAME) != 0)
+		errx(-1, "not ok 9 - getsockopt() after setsockopt() after "
+		    "listen() mismatch (got %s expected %s)", afa.af_name,
+		    ACCF_NAME);
+	printf("ok 9 - getsockopt\n");
 
-	printf("PASS\n");
 	close(lso);
 	return (0);
 }