From e5a5c099afb315e6e35483c60e5bfa6d9ce9f775 Mon Sep 17 00:00:00 2001 From: Luca Di Sera Date: Wed, 18 May 2022 08:45:48 +0200 Subject: [PATCH] Add an exception in testrunner for QDoc MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QDoc recently added some tests that use Catch2 instead of testlib. Similarly to selftests, the normal behavior of `qt-testrunner.py` will fail, trying to pass an argument that is not supported by Catch2 when running the tests in CI. To avoid the issue, an exception for the test executables that QDoc uses was added to `qt-testrunner.py`, using the already available mechanism that is used for selftests. Change-Id: I5eb4b75f239eda0c493fb06ece164545d159372b Reviewed-by: Topi Reiniö Reviewed-by: Dimitrios Apostolou --- util/testrunner/qt-testrunner.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/util/testrunner/qt-testrunner.py b/util/testrunner/qt-testrunner.py index 3e2a701153d..cb54d70f1bd 100755 --- a/util/testrunner/qt-testrunner.py +++ b/util/testrunner/qt-testrunner.py @@ -83,7 +83,9 @@ NO_RERUN_FUNCTIONS = { # not try to append "-o" to their command-line or re-run failed testcases. # Only add tests here if absolutely necessary! NON_XML_GENERATING_TESTS = { - "tst_selftests", # qtestlib's selftests are using an external test framework (Catch) that does not support -o argument + "tst_selftests", # qtestlib's selftests are using an external test framework (Catch) that does not support -o argument + "tst_QDoc", # Some of QDoc's tests are using an external test framework (Catch) that does not support -o argument + "tst_QDoc_Catch_Generators", # Some of QDoc's tests are using an external test framework (Catch) that does not support -o argument }