Skip to contentSkip to conversation

tests/qtest/qom-test: Do not print tested properties by default

PATCH Superseded Thomas Huth 2 participants 3 messages Dec 15, 2022

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tests/qtest/qom-test: Do not print tested properties by default

We're still running into the problem that some logs are cut in the gitlab-CI since they got too big. The biggest part of the log is still the output of the qom-test. Let's stop printing the properties by default to get to a saner size here. The full output can still be enabled by setting V=2 (or higher) in the environment.

---
 tests/qtest/qom-test.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
tests/qtest/qom-test.c +11 -1
index 13510bc349..a0e5672cb3 100644
@@ -14,6 +14,8 @@
 #include "qemu/cutils.h"
 #include "libqtest.h"
 
+static bool verbose;
+
 static void test_properties(QTestState *qts, const char *path, bool recurse)
 {
     char *child_path;
@@ -49,7 +51,9 @@ static void test_properties(QTestState *qts, const char *path, bool recurse)
             }
         } else {
             const char *prop = qdict_get_str(tuple, "name");
-            g_test_message("-> %s", prop);
+            if (verbose) {
+                g_test_message("-> %s", prop);
+            }
             tmp = qtest_qmp(qts,
                             "{ 'execute': 'qom-get',"
                             "  'arguments': { 'path': %s, 'property': %s } }",
@@ -103,6 +107,12 @@ static void add_machine_test_case(const char *mname)
 
 int main(int argc, char **argv)
 {
+    char *v_env = getenv("V");
+
+    if (v_env && *v_env >= '2') {
+        verbose = true;
+    }
+
     g_test_init(&argc, &argv, NULL);
 
     qtest_cb_for_every_machine(add_machine_test_case, g_test_quick());
Signature · 1 line
2.31.1
#1 lore raw
Quoted 10 lines · Thomas Huth

We're still running into the problem that some logs are cut in the gitlab-CI since they got too big. The biggest part of the log is still the output of the qom-test. Let's stop printing the properties by default to get to a saner size here. The full output can still be enabled by setting V=2 (or higher) in the environment.

tests/qtest/qom-test.c static void add_machine_test_case(const char *mname) · line 114

Quoted 8 lines
tests/qtest/qom-test.c +5 -0
@@ -103,6 +107,12 @@ static void add_machine_test_case(const char *mname)
 
 int main(int argc, char **argv)
 {
+    char *v_env = getenv("V");
+
+    if (v_env && *v_env >= '2') {
+        verbose = true;
+    }

This is a bit cheesy -- I think we should parse the string to a number properly rather than accepting '2', '23', '2.89237', '2e45' '2fast2furious' etc :-)

thanks
-- PMM

#2 lore raw
Quoted 12 lines · Peter Maydell
Quoted 11 lines · Thomas Huth

We're still running into the problem that some logs are cut in the gitlab-CI since they got too big. The biggest part of the log is still the output of the qom-test. Let's stop printing the properties by default to get to a saner size here. The full output can still be enabled by setting V=2 (or higher) in the environment.

(quoted diff) +0 -0
@@ -103,6 +107,12 @@ static void add_machine_test_case(const char *mname)
 
Quoted 11 lines

tests/qtest/qom-test.c static void add_machine_test_case(const char *mname) · line 114

Quoted 7 lines
tests/qtest/qom-test.c +5 -0
  int main(int argc, char **argv)
  {
+    char *v_env = getenv("V");
+
+    if (v_env && *v_env >= '2') {
+        verbose = true;
+    }

This is a bit cheesy -- I think we should parse the string to a number properly rather than accepting '2', '23', '2.89237', '2e45' '2fast2furious' etc :-)

Ok, true, it's a little bit weird that it's verbose for V=9 but not for V=10 ... I'll rework the patch and send a patch for hmp-test.c, too (where I've copied the code from).

Thomas