*** empty log message ***

diff --git a/regress/lib/libc/sys/atf-c.h b/regress/lib/libc/sys/atf-c.h
index c10628b..1a0f29d 100644 (file)
--- a/regress/lib/libc/sys/atf-c.h
+++ b/regress/lib/libc/sys/atf-c.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: atf-c.h,v 1.3 2021/09/02 12:40:44 mbuhl Exp $ */
+/*     $OpenBSD: atf-c.h,v 1.4 2022/05/28 18:39:39 mbuhl Exp $ */
 /*
  * Copyright (c) 2019 Moritz Buhl <openbsd@moritzbuhl.de>
  *
@@ -80,7 +80,7 @@ ATF_TC_FUNCTIONS(fn)
 #define ATF_CHECK_STREQ        ATF_REQUIRE_STREQ
 
 #define atf_req(exp, err, msg, ...)                                    \
-       atf_require(exp, err, #exp, __FILE__, __LINE__, NULL)
+       atf_require(exp, err, #exp, __FILE__, __LINE__, msg, ##__VA_ARGS__)
 #define ATF_REQUIRE(exp)               atf_req(exp, -1, NULL)
 #define ATF_REQUIRE_ERRNO(no, exp)     atf_req(exp, no, NULL)
 #define ATF_REQUIRE_MSG(exp, fmt, ...) atf_req(exp, -1, fmt, ##__VA_ARGS__)

diff --git a/regress/lib/libc/sys/t_poll.c b/regress/lib/libc/sys/t_poll.c
index d27fbf1..345b6c7 100644 (file)
--- a/regress/lib/libc/sys/t_poll.c
+++ b/regress/lib/libc/sys/t_poll.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: t_poll.c,v 1.2 2020/11/09 23:18:51 bluhm Exp $        */
+/*     $OpenBSD: t_poll.c,v 1.3 2022/05/28 18:39:39 mbuhl Exp $        */
 /*     $NetBSD: t_poll.c,v 1.4 2020/07/17 15:34:16 kamil Exp $ */
 
 /*-
@@ -175,16 +175,16 @@ ATF_TC_BODY(basic, tc)
         */
        pfds[0].revents = -1;
        pfds[1].revents = -1;
-       ATF_REQUIRE_EQ_MSG(ret = poll(&pfds[0], 1, 1), 0,
-           "got: %d", ret);
+       ret = poll(&pfds[0], 1, 1);
+       ATF_REQUIRE_EQ_MSG(ret, 0, "got: %d", ret);
        ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
        ATF_REQUIRE_EQ_MSG(pfds[1].revents, -1, "got: %d", pfds[1].revents);
 
        /* Check that the write end of the pipe as reported as ready. */
        pfds[0].revents = -1;
        pfds[1].revents = -1;
-       ATF_REQUIRE_EQ_MSG(ret = poll(&pfds[1], 1, 1), 1,
-           "got: %d", ret);
+       ret = poll(&pfds[1], 1, 1);
+       ATF_REQUIRE_EQ_MSG(ret, 1, "got: %d", ret);
        ATF_REQUIRE_EQ_MSG(pfds[0].revents, -1, "got: %d", pfds[0].revents);
        ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",\
            pfds[1].revents);
@@ -192,8 +192,8 @@ ATF_TC_BODY(basic, tc)
        /* Check that only the write end of the pipe as reported as ready. */
        pfds[0].revents = -1;
        pfds[1].revents = -1;
-       ATF_REQUIRE_EQ_MSG(ret = poll(pfds, 2, 1), 1,
-           "got: %d", ret);
+       ret = poll(pfds, 2, 1);
+       ATF_REQUIRE_EQ_MSG(ret, 1, "got: %d", ret);
        ATF_REQUIRE_EQ_MSG(pfds[0].revents, 0, "got: %d", pfds[0].revents);
        ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",
            pfds[1].revents);
@@ -204,8 +204,8 @@ ATF_TC_BODY(basic, tc)
        /* Check that both ends of our pipe are reported as ready. */
        pfds[0].revents = -1;
        pfds[1].revents = -1;
-       ATF_REQUIRE_EQ_MSG(ret = poll(pfds, 2, 1), 2,
-           "got: %d", ret);
+       ret = poll(pfds, 2, 1);
+       ATF_REQUIRE_EQ_MSG(ret, 2, "got: %d", ret);
        ATF_REQUIRE_EQ_MSG(pfds[0].revents, POLLIN, "got: %d",
            pfds[0].revents);
        ATF_REQUIRE_EQ_MSG(pfds[1].revents, POLLOUT, "got: %d",

diff --git a/regress/lib/libc/sys/t_recvmmsg.c b/regress/lib/libc/sys/t_recvmmsg.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regress/lib/libc/sys/t_sendmmsg.c b/regress/lib/libc/sys/t_sendmmsg.c
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/regress/lib/libm/msun/atf-c.h b/regress/lib/libm/msun/atf-c.h
index 11bf1d8..a34e8b4 100644 (file)
--- a/regress/lib/libm/msun/atf-c.h
+++ b/regress/lib/libm/msun/atf-c.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: atf-c.h,v 1.1 2021/10/22 18:00:22 mbuhl Exp $ */
+/*     $OpenBSD: atf-c.h,v 1.2 2022/05/28 18:39:39 mbuhl Exp $ */
 /*
  * Copyright (c) 2019-2021 Moritz Buhl <mbuhl@openbsd.org>
  *
@@ -86,7 +86,7 @@ ATF_TC_FUNCTIONS(fn)
 #define ATF_CHECK_STREQ        ATF_REQUIRE_STREQ
 
 #define atf_req(exp, err, msg, ...)                                    \
-       atf_require(exp, err, #exp, __FILE__, __LINE__, NULL)
+       atf_require(exp, err, #exp, __FILE__, __LINE__, msg, ##__VA_ARGS__)
 #define ATF_REQUIRE(exp)               atf_req(exp, -1, NULL)
 #define ATF_REQUIRE_ERRNO(no, exp)     atf_req(exp, no, NULL)
 #define ATF_REQUIRE_MSG(exp, fmt, ...) atf_req(exp, -1, fmt, ##__VA_ARGS__)

diff --git a/regress/lib/libm/msun/macros.h b/regress/lib/libm/msun/macros.h
index b415f3c..0f5329d 100644 (file)
--- a/regress/lib/libm/msun/macros.h
+++ b/regress/lib/libm/msun/macros.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: macros.h,v 1.3 2021/12/13 18:04:28 deraadt Exp $       */
+/*      $OpenBSD: macros.h,v 1.4 2022/05/28 18:39:39 mbuhl Exp $       */
 /* Public domain - Moritz Buhl */
 
 #define rounddown(x, y)        (((x)/(y))*(y))
@@ -6,3 +6,4 @@
 #define hexdump(...)
 
 #define nitems(_a)      (sizeof((_a)) / sizeof((_a)[0]))
+#define __XSTRING(_a)  (#_a)