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 06171ae12b24d3609d21ecc5baae5590c3fd911b..15a8010cef3ba68c21de92e430ef5604a6f96967 100644 (file)
--- 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 126819ef4ae8daabf7e6b23df30f0725615b424e..b379f1a183e9a5c4c8fd61269768e0769e8e9231 100644 (file)
--- 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)