Merge remote-tracking branch 'origin/tqtc/lts-5.15.9' into tqtc/lts-5.15-opensourcev5.15.9-lts-lgpl

Change-Id: Iaff6b55275e50d19973e1020853d8622587069f9

1 files changed, 7 insertions, 0 deletions

diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py
index 96fab44408..e4a0217686 100755
--- a/tests/auto/testlib/selftests/generate_expected_output.py
+++ b/tests/auto/testlib/selftests/generate_expected_output.py
@@ -308,6 +308,13 @@ def generateTestData(testname, clean,
         print("Warning: directory", testname, "contains no test executable")
         return
 
+    # See TestLogger::shouldIgnoreTest() in tst_selftest.cpp for these
+    # single-format tests:
+    if testname == 'junit':
+        formats = ( 'junitxml', ) if 'junitxml' in formats else ()
+    elif testname == 'float':
+        formats = ( 'txt', ) if 'txt' in formats else ()
+
     # Prepare environment in which to run tests:
     env = testEnv(testname)