git: 09cdbf042f82 - main - libc: tests: allow fortified test cases to require root

From: Kyle Evans <kevans_at_FreeBSD.org>
Date: Thu, 20 Mar 2025 04:44:34 UTC
The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=09cdbf042f825fc41762b5d5365ad930fec18b99

commit 09cdbf042f825fc41762b5d5365ad930fec18b99
Author:     Kyle Evans <kevans@FreeBSD.org>
AuthorDate: 2025-03-20 04:43:14 +0000
Commit:     Kyle Evans <kevans@FreeBSD.org>
CommitDate: 2025-03-20 04:44:25 +0000

    libc: tests: allow fortified test cases to require root
    
    An upcoming test will require root to create a jail with its own
    domainname/hostname to avoid external requirements on the test runner
    as we want to fetch them with valid and plausible sizes.
    
    Generate test headers for all cases to reduce churn in future diffs as
    metadata is added to individual tests, or in case other test options
    are added to correspond to different metadata to set.
    
    Reviewed by:    jlduran, markj
    Differential Revision:  https://reviews.freebsd.org/D49236
---
 lib/libc/tests/secure/fortify_poll_test.c        |  60 ++++-
 lib/libc/tests/secure/fortify_random_test.c      |  25 +-
 lib/libc/tests/secure/fortify_select_test.c      |  90 +++++--
 lib/libc/tests/secure/fortify_socket_test.c      | 255 ++++++++++++++----
 lib/libc/tests/secure/fortify_stdio_test.c       | 225 ++++++++++++----
 lib/libc/tests/secure/fortify_stdlib_test.c      |  50 +++-
 lib/libc/tests/secure/fortify_string_test.c      | 325 ++++++++++++++++++-----
 lib/libc/tests/secure/fortify_strings_test.c     |  75 ++++--
 lib/libc/tests/secure/fortify_uio_test.c         | 110 ++++++--
 lib/libc/tests/secure/fortify_unistd_test.c      | 325 ++++++++++++++++++-----
 lib/libc/tests/secure/fortify_wchar_test.c       | 300 ++++++++++++++++-----
 lib/libc/tests/secure/generate-fortify-tests.lua |  13 +-
 12 files changed, 1482 insertions(+), 371 deletions(-)

diff --git a/lib/libc/tests/secure/fortify_poll_test.c b/lib/libc/tests/secure/fortify_poll_test.c
index dce0b0bb65ea..9a5610cc3f0d 100644
--- a/lib/libc/tests/secure/fortify_poll_test.c
+++ b/lib/libc/tests/secure/fortify_poll_test.c
@@ -162,7 +162,10 @@ replace_stdin(void)
 		close(fd);
 }
 
-ATF_TC_WITHOUT_HEAD(poll_before_end);
+ATF_TC(poll_before_end);
+ATF_TC_HEAD(poll_before_end, tc)
+{
+}
 ATF_TC_BODY(poll_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -184,7 +187,10 @@ ATF_TC_BODY(poll_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(poll_end);
+ATF_TC(poll_end);
+ATF_TC_HEAD(poll_end, tc)
+{
+}
 ATF_TC_BODY(poll_end, tc)
 {
 #define BUF &__stack.__buf
@@ -206,7 +212,10 @@ ATF_TC_BODY(poll_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(poll_after_end);
+ATF_TC(poll_after_end);
+ATF_TC_HEAD(poll_after_end, tc)
+{
+}
 ATF_TC_BODY(poll_after_end, tc)
 {
 #define BUF &__stack.__buf
@@ -259,7 +268,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(poll_heap_before_end);
+ATF_TC(poll_heap_before_end);
+ATF_TC_HEAD(poll_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(poll_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -282,7 +294,10 @@ ATF_TC_BODY(poll_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(poll_heap_end);
+ATF_TC(poll_heap_end);
+ATF_TC_HEAD(poll_heap_end, tc)
+{
+}
 ATF_TC_BODY(poll_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -305,7 +320,10 @@ ATF_TC_BODY(poll_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(poll_heap_after_end);
+ATF_TC(poll_heap_after_end);
+ATF_TC_HEAD(poll_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(poll_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -359,7 +377,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(ppoll_before_end);
+ATF_TC(ppoll_before_end);
+ATF_TC_HEAD(ppoll_before_end, tc)
+{
+}
 ATF_TC_BODY(ppoll_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -382,7 +403,10 @@ ATF_TC_BODY(ppoll_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(ppoll_end);
+ATF_TC(ppoll_end);
+ATF_TC_HEAD(ppoll_end, tc)
+{
+}
 ATF_TC_BODY(ppoll_end, tc)
 {
 #define BUF &__stack.__buf
@@ -405,7 +429,10 @@ ATF_TC_BODY(ppoll_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(ppoll_after_end);
+ATF_TC(ppoll_after_end);
+ATF_TC_HEAD(ppoll_after_end, tc)
+{
+}
 ATF_TC_BODY(ppoll_after_end, tc)
 {
 #define BUF &__stack.__buf
@@ -459,7 +486,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(ppoll_heap_before_end);
+ATF_TC(ppoll_heap_before_end);
+ATF_TC_HEAD(ppoll_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(ppoll_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -483,7 +513,10 @@ ATF_TC_BODY(ppoll_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(ppoll_heap_end);
+ATF_TC(ppoll_heap_end);
+ATF_TC_HEAD(ppoll_heap_end, tc)
+{
+}
 ATF_TC_BODY(ppoll_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -507,7 +540,10 @@ ATF_TC_BODY(ppoll_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(ppoll_heap_after_end);
+ATF_TC(ppoll_heap_after_end);
+ATF_TC_HEAD(ppoll_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(ppoll_heap_after_end, tc)
 {
 #define BUF __stack.__buf
diff --git a/lib/libc/tests/secure/fortify_random_test.c b/lib/libc/tests/secure/fortify_random_test.c
index 7763607dd2ed..41100fe5a5e2 100644
--- a/lib/libc/tests/secure/fortify_random_test.c
+++ b/lib/libc/tests/secure/fortify_random_test.c
@@ -162,7 +162,10 @@ replace_stdin(void)
 		close(fd);
 }
 
-ATF_TC_WITHOUT_HEAD(getrandom_before_end);
+ATF_TC(getrandom_before_end);
+ATF_TC_HEAD(getrandom_before_end, tc)
+{
+}
 ATF_TC_BODY(getrandom_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -180,7 +183,10 @@ ATF_TC_BODY(getrandom_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getrandom_end);
+ATF_TC(getrandom_end);
+ATF_TC_HEAD(getrandom_end, tc)
+{
+}
 ATF_TC_BODY(getrandom_end, tc)
 {
 #define BUF &__stack.__buf
@@ -198,7 +204,10 @@ ATF_TC_BODY(getrandom_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getrandom_heap_before_end);
+ATF_TC(getrandom_heap_before_end);
+ATF_TC_HEAD(getrandom_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(getrandom_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -218,7 +227,10 @@ ATF_TC_BODY(getrandom_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getrandom_heap_end);
+ATF_TC(getrandom_heap_end);
+ATF_TC_HEAD(getrandom_heap_end, tc)
+{
+}
 ATF_TC_BODY(getrandom_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -238,7 +250,10 @@ ATF_TC_BODY(getrandom_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getrandom_heap_after_end);
+ATF_TC(getrandom_heap_after_end);
+ATF_TC_HEAD(getrandom_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(getrandom_heap_after_end, tc)
 {
 #define BUF __stack.__buf
diff --git a/lib/libc/tests/secure/fortify_select_test.c b/lib/libc/tests/secure/fortify_select_test.c
index dfafac7e4d6d..aff13ccf58d2 100644
--- a/lib/libc/tests/secure/fortify_select_test.c
+++ b/lib/libc/tests/secure/fortify_select_test.c
@@ -162,7 +162,10 @@ replace_stdin(void)
 		close(fd);
 }
 
-ATF_TC_WITHOUT_HEAD(FD_SET_before_end);
+ATF_TC(FD_SET_before_end);
+ATF_TC_HEAD(FD_SET_before_end, tc)
+{
+}
 ATF_TC_BODY(FD_SET_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -180,7 +183,10 @@ ATF_TC_BODY(FD_SET_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_SET_end);
+ATF_TC(FD_SET_end);
+ATF_TC_HEAD(FD_SET_end, tc)
+{
+}
 ATF_TC_BODY(FD_SET_end, tc)
 {
 #define BUF &__stack.__buf
@@ -198,7 +204,10 @@ ATF_TC_BODY(FD_SET_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_SET_after_end);
+ATF_TC(FD_SET_after_end);
+ATF_TC_HEAD(FD_SET_after_end, tc)
+{
+}
 ATF_TC_BODY(FD_SET_after_end, tc)
 {
 #define BUF &__stack.__buf
@@ -247,7 +256,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_SET_heap_before_end);
+ATF_TC(FD_SET_heap_before_end);
+ATF_TC_HEAD(FD_SET_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(FD_SET_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -267,7 +279,10 @@ ATF_TC_BODY(FD_SET_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_SET_heap_end);
+ATF_TC(FD_SET_heap_end);
+ATF_TC_HEAD(FD_SET_heap_end, tc)
+{
+}
 ATF_TC_BODY(FD_SET_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -287,7 +302,10 @@ ATF_TC_BODY(FD_SET_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_SET_heap_after_end);
+ATF_TC(FD_SET_heap_after_end);
+ATF_TC_HEAD(FD_SET_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(FD_SET_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -338,7 +356,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_CLR_before_end);
+ATF_TC(FD_CLR_before_end);
+ATF_TC_HEAD(FD_CLR_before_end, tc)
+{
+}
 ATF_TC_BODY(FD_CLR_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -356,7 +377,10 @@ ATF_TC_BODY(FD_CLR_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_CLR_end);
+ATF_TC(FD_CLR_end);
+ATF_TC_HEAD(FD_CLR_end, tc)
+{
+}
 ATF_TC_BODY(FD_CLR_end, tc)
 {
 #define BUF &__stack.__buf
@@ -374,7 +398,10 @@ ATF_TC_BODY(FD_CLR_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_CLR_after_end);
+ATF_TC(FD_CLR_after_end);
+ATF_TC_HEAD(FD_CLR_after_end, tc)
+{
+}
 ATF_TC_BODY(FD_CLR_after_end, tc)
 {
 #define BUF &__stack.__buf
@@ -423,7 +450,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_CLR_heap_before_end);
+ATF_TC(FD_CLR_heap_before_end);
+ATF_TC_HEAD(FD_CLR_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(FD_CLR_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -443,7 +473,10 @@ ATF_TC_BODY(FD_CLR_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_CLR_heap_end);
+ATF_TC(FD_CLR_heap_end);
+ATF_TC_HEAD(FD_CLR_heap_end, tc)
+{
+}
 ATF_TC_BODY(FD_CLR_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -463,7 +496,10 @@ ATF_TC_BODY(FD_CLR_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_CLR_heap_after_end);
+ATF_TC(FD_CLR_heap_after_end);
+ATF_TC_HEAD(FD_CLR_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(FD_CLR_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -514,7 +550,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_ISSET_before_end);
+ATF_TC(FD_ISSET_before_end);
+ATF_TC_HEAD(FD_ISSET_before_end, tc)
+{
+}
 ATF_TC_BODY(FD_ISSET_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -532,7 +571,10 @@ ATF_TC_BODY(FD_ISSET_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_ISSET_end);
+ATF_TC(FD_ISSET_end);
+ATF_TC_HEAD(FD_ISSET_end, tc)
+{
+}
 ATF_TC_BODY(FD_ISSET_end, tc)
 {
 #define BUF &__stack.__buf
@@ -550,7 +592,10 @@ ATF_TC_BODY(FD_ISSET_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_ISSET_after_end);
+ATF_TC(FD_ISSET_after_end);
+ATF_TC_HEAD(FD_ISSET_after_end, tc)
+{
+}
 ATF_TC_BODY(FD_ISSET_after_end, tc)
 {
 #define BUF &__stack.__buf
@@ -599,7 +644,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_before_end);
+ATF_TC(FD_ISSET_heap_before_end);
+ATF_TC_HEAD(FD_ISSET_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(FD_ISSET_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -619,7 +667,10 @@ ATF_TC_BODY(FD_ISSET_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_end);
+ATF_TC(FD_ISSET_heap_end);
+ATF_TC_HEAD(FD_ISSET_heap_end, tc)
+{
+}
 ATF_TC_BODY(FD_ISSET_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -639,7 +690,10 @@ ATF_TC_BODY(FD_ISSET_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(FD_ISSET_heap_after_end);
+ATF_TC(FD_ISSET_heap_after_end);
+ATF_TC_HEAD(FD_ISSET_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(FD_ISSET_heap_after_end, tc)
 {
 #define BUF __stack.__buf
diff --git a/lib/libc/tests/secure/fortify_socket_test.c b/lib/libc/tests/secure/fortify_socket_test.c
index a2125d60fc2d..1f0b0f144f40 100644
--- a/lib/libc/tests/secure/fortify_socket_test.c
+++ b/lib/libc/tests/secure/fortify_socket_test.c
@@ -162,7 +162,10 @@ replace_stdin(void)
 		close(fd);
 }
 
-ATF_TC_WITHOUT_HEAD(getpeername_before_end);
+ATF_TC(getpeername_before_end);
+ATF_TC_HEAD(getpeername_before_end, tc)
+{
+}
 ATF_TC_BODY(getpeername_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -184,7 +187,10 @@ ATF_TC_BODY(getpeername_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getpeername_end);
+ATF_TC(getpeername_end);
+ATF_TC_HEAD(getpeername_end, tc)
+{
+}
 ATF_TC_BODY(getpeername_end, tc)
 {
 #define BUF &__stack.__buf
@@ -206,7 +212,10 @@ ATF_TC_BODY(getpeername_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getpeername_heap_before_end);
+ATF_TC(getpeername_heap_before_end);
+ATF_TC_HEAD(getpeername_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(getpeername_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -229,7 +238,10 @@ ATF_TC_BODY(getpeername_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getpeername_heap_end);
+ATF_TC(getpeername_heap_end);
+ATF_TC_HEAD(getpeername_heap_end, tc)
+{
+}
 ATF_TC_BODY(getpeername_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -252,7 +264,10 @@ ATF_TC_BODY(getpeername_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getpeername_heap_after_end);
+ATF_TC(getpeername_heap_after_end);
+ATF_TC_HEAD(getpeername_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(getpeername_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -306,7 +321,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(getsockname_before_end);
+ATF_TC(getsockname_before_end);
+ATF_TC_HEAD(getsockname_before_end, tc)
+{
+}
 ATF_TC_BODY(getsockname_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -328,7 +346,10 @@ ATF_TC_BODY(getsockname_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getsockname_end);
+ATF_TC(getsockname_end);
+ATF_TC_HEAD(getsockname_end, tc)
+{
+}
 ATF_TC_BODY(getsockname_end, tc)
 {
 #define BUF &__stack.__buf
@@ -350,7 +371,10 @@ ATF_TC_BODY(getsockname_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getsockname_heap_before_end);
+ATF_TC(getsockname_heap_before_end);
+ATF_TC_HEAD(getsockname_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(getsockname_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -373,7 +397,10 @@ ATF_TC_BODY(getsockname_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getsockname_heap_end);
+ATF_TC(getsockname_heap_end);
+ATF_TC_HEAD(getsockname_heap_end, tc)
+{
+}
 ATF_TC_BODY(getsockname_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -396,7 +423,10 @@ ATF_TC_BODY(getsockname_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(getsockname_heap_after_end);
+ATF_TC(getsockname_heap_after_end);
+ATF_TC_HEAD(getsockname_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(getsockname_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -450,7 +480,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recv_before_end);
+ATF_TC(recv_before_end);
+ATF_TC_HEAD(recv_before_end, tc)
+{
+}
 ATF_TC_BODY(recv_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -471,7 +504,10 @@ ATF_TC_BODY(recv_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recv_end);
+ATF_TC(recv_end);
+ATF_TC_HEAD(recv_end, tc)
+{
+}
 ATF_TC_BODY(recv_end, tc)
 {
 #define BUF &__stack.__buf
@@ -492,7 +528,10 @@ ATF_TC_BODY(recv_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recv_heap_before_end);
+ATF_TC(recv_heap_before_end);
+ATF_TC_HEAD(recv_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(recv_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -514,7 +553,10 @@ ATF_TC_BODY(recv_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recv_heap_end);
+ATF_TC(recv_heap_end);
+ATF_TC_HEAD(recv_heap_end, tc)
+{
+}
 ATF_TC_BODY(recv_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -536,7 +578,10 @@ ATF_TC_BODY(recv_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recv_heap_after_end);
+ATF_TC(recv_heap_after_end);
+ATF_TC_HEAD(recv_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(recv_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -589,7 +634,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_before_end);
+ATF_TC(recvfrom_before_end);
+ATF_TC_HEAD(recvfrom_before_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -610,7 +658,10 @@ ATF_TC_BODY(recvfrom_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_end);
+ATF_TC(recvfrom_end);
+ATF_TC_HEAD(recvfrom_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_end, tc)
 {
 #define BUF &__stack.__buf
@@ -631,7 +682,10 @@ ATF_TC_BODY(recvfrom_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_heap_before_end);
+ATF_TC(recvfrom_heap_before_end);
+ATF_TC_HEAD(recvfrom_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -653,7 +707,10 @@ ATF_TC_BODY(recvfrom_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_heap_end);
+ATF_TC(recvfrom_heap_end);
+ATF_TC_HEAD(recvfrom_heap_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -675,7 +732,10 @@ ATF_TC_BODY(recvfrom_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_heap_after_end);
+ATF_TC(recvfrom_heap_after_end);
+ATF_TC_HEAD(recvfrom_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -728,7 +788,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_before_end);
+ATF_TC(recvfrom_sockaddr_before_end);
+ATF_TC_HEAD(recvfrom_sockaddr_before_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_sockaddr_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -752,7 +815,10 @@ ATF_TC_BODY(recvfrom_sockaddr_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_end);
+ATF_TC(recvfrom_sockaddr_end);
+ATF_TC_HEAD(recvfrom_sockaddr_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_sockaddr_end, tc)
 {
 #define BUF &__stack.__buf
@@ -776,7 +842,10 @@ ATF_TC_BODY(recvfrom_sockaddr_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_before_end);
+ATF_TC(recvfrom_sockaddr_heap_before_end);
+ATF_TC_HEAD(recvfrom_sockaddr_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_sockaddr_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -801,7 +870,10 @@ ATF_TC_BODY(recvfrom_sockaddr_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_end);
+ATF_TC(recvfrom_sockaddr_heap_end);
+ATF_TC_HEAD(recvfrom_sockaddr_heap_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_sockaddr_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -826,7 +898,10 @@ ATF_TC_BODY(recvfrom_sockaddr_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvfrom_sockaddr_heap_after_end);
+ATF_TC(recvfrom_sockaddr_heap_after_end);
+ATF_TC_HEAD(recvfrom_sockaddr_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(recvfrom_sockaddr_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -882,7 +957,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_before_end);
+ATF_TC(recvmsg_msg_name_before_end);
+ATF_TC_HEAD(recvmsg_msg_name_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_name_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -906,7 +984,10 @@ ATF_TC_BODY(recvmsg_msg_name_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_end);
+ATF_TC(recvmsg_msg_name_end);
+ATF_TC_HEAD(recvmsg_msg_name_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_name_end, tc)
 {
 #define BUF &__stack.__buf
@@ -930,7 +1011,10 @@ ATF_TC_BODY(recvmsg_msg_name_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_before_end);
+ATF_TC(recvmsg_msg_name_heap_before_end);
+ATF_TC_HEAD(recvmsg_msg_name_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_name_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -955,7 +1039,10 @@ ATF_TC_BODY(recvmsg_msg_name_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_end);
+ATF_TC(recvmsg_msg_name_heap_end);
+ATF_TC_HEAD(recvmsg_msg_name_heap_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_name_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -980,7 +1067,10 @@ ATF_TC_BODY(recvmsg_msg_name_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_name_heap_after_end);
+ATF_TC(recvmsg_msg_name_heap_after_end);
+ATF_TC_HEAD(recvmsg_msg_name_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_name_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -1036,7 +1126,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_before_end);
+ATF_TC(recvmsg_msg_iov_before_end);
+ATF_TC_HEAD(recvmsg_msg_iov_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_iov_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -1070,7 +1163,10 @@ ATF_TC_BODY(recvmsg_msg_iov_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_end);
+ATF_TC(recvmsg_msg_iov_end);
+ATF_TC_HEAD(recvmsg_msg_iov_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_iov_end, tc)
 {
 #define BUF &__stack.__buf
@@ -1104,7 +1200,10 @@ ATF_TC_BODY(recvmsg_msg_iov_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_before_end);
+ATF_TC(recvmsg_msg_iov_heap_before_end);
+ATF_TC_HEAD(recvmsg_msg_iov_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_iov_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -1139,7 +1238,10 @@ ATF_TC_BODY(recvmsg_msg_iov_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_end);
+ATF_TC(recvmsg_msg_iov_heap_end);
+ATF_TC_HEAD(recvmsg_msg_iov_heap_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_iov_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -1174,7 +1276,10 @@ ATF_TC_BODY(recvmsg_msg_iov_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_iov_heap_after_end);
+ATF_TC(recvmsg_msg_iov_heap_after_end);
+ATF_TC_HEAD(recvmsg_msg_iov_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_iov_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -1240,7 +1345,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_before_end);
+ATF_TC(recvmsg_msg_control_before_end);
+ATF_TC_HEAD(recvmsg_msg_control_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_control_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -1265,7 +1373,10 @@ ATF_TC_BODY(recvmsg_msg_control_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_end);
+ATF_TC(recvmsg_msg_control_end);
+ATF_TC_HEAD(recvmsg_msg_control_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_control_end, tc)
 {
 #define BUF &__stack.__buf
@@ -1290,7 +1401,10 @@ ATF_TC_BODY(recvmsg_msg_control_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_before_end);
+ATF_TC(recvmsg_msg_control_heap_before_end);
+ATF_TC_HEAD(recvmsg_msg_control_heap_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_control_heap_before_end, tc)
 {
 #define BUF __stack.__buf
@@ -1316,7 +1430,10 @@ ATF_TC_BODY(recvmsg_msg_control_heap_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_end);
+ATF_TC(recvmsg_msg_control_heap_end);
+ATF_TC_HEAD(recvmsg_msg_control_heap_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_control_heap_end, tc)
 {
 #define BUF __stack.__buf
@@ -1342,7 +1459,10 @@ ATF_TC_BODY(recvmsg_msg_control_heap_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmsg_msg_control_heap_after_end);
+ATF_TC(recvmsg_msg_control_heap_after_end);
+ATF_TC_HEAD(recvmsg_msg_control_heap_after_end, tc)
+{
+}
 ATF_TC_BODY(recvmsg_msg_control_heap_after_end, tc)
 {
 #define BUF __stack.__buf
@@ -1399,7 +1519,10 @@ monitor:
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_before_end);
+ATF_TC(recvmmsg_msgvec_before_end);
+ATF_TC_HEAD(recvmmsg_msgvec_before_end, tc)
+{
+}
 ATF_TC_BODY(recvmmsg_msgvec_before_end, tc)
 {
 #define BUF &__stack.__buf
@@ -1418,7 +1541,10 @@ ATF_TC_BODY(recvmmsg_msgvec_before_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_end);
+ATF_TC(recvmmsg_msgvec_end);
+ATF_TC_HEAD(recvmmsg_msgvec_end, tc)
+{
+}
 ATF_TC_BODY(recvmmsg_msgvec_end, tc)
 {
 #define BUF &__stack.__buf
@@ -1437,7 +1563,10 @@ ATF_TC_BODY(recvmmsg_msgvec_end, tc)
 
 }
 
-ATF_TC_WITHOUT_HEAD(recvmmsg_msgvec_after_end);
+ATF_TC(recvmmsg_msgvec_after_end);
+ATF_TC_HEAD(recvmmsg_msgvec_after_end, tc)
+{
+}
*** 3542 LINES SKIPPED ***