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

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

* tests/waitid-v.c (VERBOSE_RUSAGE): Remove.
(VERBOSE): Define to 1.
* tests/waitid.c (sprint_rusage): Check VERBOSE instead
of VERBOSE_RUSAGE.
---

diff --git a/tests/waitid-v.c b/tests/waitid-v.c
index 06171ae1..15a8010c 100644
--- a/tests/waitid-v.c
+++ b/tests/waitid-v.c
@@ -1,3 +1,3 @@
 /* This file is part of waitid-v strace test. */
-#define VERBOSE_RUSAGE
+#define VERBOSE 1
 #include "waitid.c"
diff --git a/tests/waitid.c b/tests/waitid.c
index 126819ef..b379f1a1 100644
--- a/tests/waitid.c
+++ b/tests/waitid.c
@@ -44,7 +44,7 @@ sprint_rusage(const struct rusage *const ru)
 	snprintf(buf, sizeof(buf),
 		 "{ru_utime={%llu, %llu}"
 		 ", ru_stime={%llu, %llu}"
-#ifdef VERBOSE_RUSAGE
+#if VERBOSE
 		 ", ru_maxrss=%llu"
 		 ", ru_ixrss=%llu"
 		 ", ru_idrss=%llu"
@@ -66,7 +66,7 @@ sprint_rusage(const struct rusage *const ru)
 		 , zero_extend_signed_to_ull(ru->ru_utime.tv_usec)
 		 , zero_extend_signed_to_ull(ru->ru_stime.tv_sec)
 		 , zero_extend_signed_to_ull(ru->ru_stime.tv_usec)
-#ifdef VERBOSE_RUSAGE
+#if VERBOSE
 		 , zero_extend_signed_to_ull(ru->ru_maxrss)
 		 , zero_extend_signed_to_ull(ru->ru_ixrss)
 		 , zero_extend_signed_to_ull(ru->ru_idrss)