From: Dmitry V. Levin <ldv@altlinux.org>
Date: Mon, 26 Sep 2016 15:19:05 +0000 (+0000)
Subject: tests: use VERBOSE macro in msg_control and msg_control-v tests
X-Git-Tag: v4.14~53
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=074c630705aa65f0795209a0e8ce954520226e57;p=strace

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 d2a5653a..b0afa523 100644
--- 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 4f23b2a6..7540c3d2 100644
--- 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;