diff mbox series

tests/qtest/npcm7xx_pwm-test: Be less verbose unless V=2

Message ID 20230209135047.1753081-1-peter.maydell@linaro.org
State New
Headers show
Series tests/qtest/npcm7xx_pwm-test: Be less verbose unless V=2 | expand

Commit Message

Peter Maydell Feb. 9, 2023, 1:50 p.m. UTC 
The npcm7xx_pwm-test produces a lot of output at V=1, which
means that on our CI tests the log files exceed the gitlab
500KB limit. Suppress the messages about exactly what is
being tested unless at V=2 and above.

This follows the pattern we use with qom-test.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
An example job log that got truncated because of this is:
https://gitlab.com/qemu-project/qemu/-/jobs/3742560168

 tests/qtest/npcm7xx_pwm-test.c | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

Comments

Thomas Huth Feb. 9, 2023, 1:55 p.m. UTC | #1 
On 09/02/2023 14.50, Peter Maydell wrote:
> The npcm7xx_pwm-test produces a lot of output at V=1, which
> means that on our CI tests the log files exceed the gitlab
> 500KB limit. Suppress the messages about exactly what is
> being tested unless at V=2 and above.
> 
> This follows the pattern we use with qom-test.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> An example job log that got truncated because of this is:
> https://gitlab.com/qemu-project/qemu/-/jobs/3742560168

Reviewed-by: Thomas Huth <thuth@redhat.com>
Philippe Mathieu-Daudé Feb. 9, 2023, 2:55 p.m. UTC | #2 
On 9/2/23 14:50, Peter Maydell wrote:
> The npcm7xx_pwm-test produces a lot of output at V=1, which
> means that on our CI tests the log files exceed the gitlab
> 500KB limit. Suppress the messages about exactly what is
> being tested unless at V=2 and above.
> 
> This follows the pattern we use with qom-test.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> An example job log that got truncated because of this is:
> https://gitlab.com/qemu-project/qemu/-/jobs/3742560168
> 
>   tests/qtest/npcm7xx_pwm-test.c | 27 +++++++++++++++++++++------
>   1 file changed, 21 insertions(+), 6 deletions(-)

Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff mbox series

Patch

diff --git a/tests/qtest/npcm7xx_pwm-test.c b/tests/qtest/npcm7xx_pwm-test.c
index e320a625c4b..ea4ca1d106e 100644
--- a/tests/qtest/npcm7xx_pwm-test.c
+++ b/tests/qtest/npcm7xx_pwm-test.c
@@ -20,6 +20,8 @@ 
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 
+static int verbosity_level;
+
 #define REF_HZ          25000000
 
 /* Register field definitions. */
@@ -221,7 +223,9 @@  static uint64_t pwm_qom_get(QTestState *qts, const char *path, const char *name)
     QDict *response;
     uint64_t val;
 
-    g_test_message("Getting properties %s from %s", name, path);
+    if (verbosity_level >= 2) {
+        g_test_message("Getting properties %s from %s", name, path);
+    }
     response = qtest_qmp(qts, "{ 'execute': 'qom-get',"
             " 'arguments': { 'path': %s, 'property': %s}}",
             path, name);
@@ -260,8 +264,10 @@  static void mft_qom_set(QTestState *qts, int index, const char *name,
     QDict *response;
     char *path = g_strdup_printf("/machine/soc/mft[%d]", index);
 
-    g_test_message("Setting properties %s of mft[%d] with value %u",
-                   name, index, value);
+    if (verbosity_level >= 2) {
+        g_test_message("Setting properties %s of mft[%d] with value %u",
+                       name, index, value);
+    }
     response = qtest_qmp(qts, "{ 'execute': 'qom-set',"
             " 'arguments': { 'path': %s, "
             " 'property': %s, 'value': %u}}",
@@ -506,9 +512,12 @@  static void mft_verify_rpm(QTestState *qts, const TestData *td, uint64_t duty)
     int32_t expected_cnt = mft_compute_cnt(rpm, clk);
 
     qtest_irq_intercept_in(qts, "/machine/soc/a9mpcore/gic");
-    g_test_message(
-        "verifying rpm for mft[%d]: clk: %" PRIu64 ", duty: %" PRIu64 ", rpm: %u, cnt: %d",
-        index, clk, duty, rpm, expected_cnt);
+    if (verbosity_level >= 2) {
+        g_test_message(
+            "verifying rpm for mft[%d]: clk: %" PRIu64 ", duty: %" PRIu64
+            ", rpm: %u, cnt: %d",
+            index, clk, duty, rpm, expected_cnt);
+    }
 
     /* Verify rpm for fan A */
     /* Stop capture */
@@ -670,6 +679,12 @@  int main(int argc, char **argv)
 {
     TestData test_data_list[ARRAY_SIZE(pwm_module_list) * ARRAY_SIZE(pwm_list)];
 
+    char *v_env = getenv("V");
+
+    if (v_env) {
+        verbosity_level = atoi(v_env);
+    }
+
     g_test_init(&argc, &argv, NULL);
 
     for (int i = 0; i < ARRAY_SIZE(pwm_module_list); ++i) {