diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-07-28 10:32:11 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-07-30 09:38:46 +0000 |
| commit | 571e3a476d0ea3ec0cdf6660c371b05408d047e3 (patch) | |
| tree | 492374d8a7f85baf31689ab925748e241516af69 /src/testlib | |
| parent | 6c017ac1edf3e51a307e68134d8a0c8f8dffbdfe (diff) | |
testlib: Update a few remaining instances of the deprecated -xunitxml format
The format was renamed in 27db9e458cef512fca3a6b5c9ebbcda7a8172428.
Change-Id: I53975c7467d8768dc9dc9ac2d89c42eefa12e22f
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit 7c14223b1e21a3e19a0f84c772c0c8ca49dfe74f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/testlib')
| -rw-r--r-- | src/testlib/qtestcase.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 5388164e75..db3c42a9fa 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -631,7 +631,10 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool logFormat = QTestLog::Plain; } else if (strcmp(argv[i], "-csv") == 0) { logFormat = QTestLog::CSV; - } else if (strcmp(argv[i], "-junitxml") == 0 || strcmp(argv[i], "-xunitxml") == 0) { + } else if (strcmp(argv[i], "-junitxml") == 0) { + logFormat = QTestLog::JUnitXML; + } else if (strcmp(argv[i], "-xunitxml") == 0) { + fprintf(stderr, "WARNING: xunitxml is deprecated. Please use junitxml.\n"); logFormat = QTestLog::JUnitXML; } else if (strcmp(argv[i], "-xml") == 0) { logFormat = QTestLog::XML; @@ -671,9 +674,12 @@ Q_TESTLIB_EXPORT void qtest_qParseArgs(int argc, const char *const argv[], bool logFormat = QTestLog::LightXML; else if (strcmp(format, "xml") == 0) logFormat = QTestLog::XML; - else if (strcmp(format, "junitxml") == 0 || strcmp(format, "xunitxml") == 0) + else if (strcmp(format, "junitxml") == 0) + logFormat = QTestLog::JUnitXML; + else if (strcmp(format, "xunitxml") == 0) { + fprintf(stderr, "WARNING: xunitxml is deprecated. Please use junitxml.\n"); logFormat = QTestLog::JUnitXML; - else if (strcmp(format, "teamcity") == 0) + } else if (strcmp(format, "teamcity") == 0) logFormat = QTestLog::TeamCity; else if (strcmp(format, "tap") == 0) logFormat = QTestLog::TAP; |