tests: use VERBOSE macro in msg_control and msg_control-v tests

* tests/msg_control-v.c (VERBOSE_MSGHDR): Remove.
(VERBOSE): Define to 1.
* tests/msg_control.c (print_fds, print_ip_opts): Check VERBOSE instead
of VERBOSE_MSGHDR.

diff --git a/tests/msg_control-v.c b/tests/msg_control-v.c
index d2a5653a44c5c65a65b22ec8ab40c649b9050e54..b0afa523aba04081490c1c8be8019ad2ce8bbe09 100644 (file)
--- a/tests/msg_control-v.c
+++ b/tests/msg_control-v.c
@@ -1,3 +1,3 @@
 /* This file is part of msg_control-v strace test. */
-#define VERBOSE_MSGHDR
+#define VERBOSE 1
 #include "msg_control.c"

diff --git a/tests/msg_control.c b/tests/msg_control.c
index 4f23b2a677469563549a9a8d649b37d69afbcb3a..7540c3d29baa08d1b30005cbcca3cb1b294a9a7b 100644 (file)
--- a/tests/msg_control.c
+++ b/tests/msg_control.c
@@ -77,7 +77,7 @@ print_fds(const struct cmsghdr *const cmsg, const size_t cmsg_len)
        for (i = 0; i < nfd; ++i) {
                if (i)
                        printf(", ");
-#ifndef VERBOSE_MSGHDR
+#if !VERBOSE
                if (i >= DEFAULT_STRLEN) {
                        printf("...");
                        break;
@@ -479,7 +479,7 @@ print_ip_opts(const void *const cmsg_data, const unsigned int data_len)
        for (i = 0; i < data_len; ++i) {
                if (i)
                        printf(", ");
-#ifndef VERBOSE_MSGHDR
+#if !VERBOSE
                if (i >= DEFAULT_STRLEN) {
                        printf("...");
                        break;