diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-22 13:36:20 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-07-22 23:23:05 +0200 |
| commit | b33c056a61b13235186ba196e82618211ebe5ae4 (patch) | |
| tree | 8b843de64895e0bb2ff298c29c9618f605220b76 /tests/auto | |
| parent | f1c16139e37ae1ee27a30814f34fa15161ad9d44 (diff) | |
testlib selftest: unify xml quoted asserts that include line numbers
Change-Id: If66303bab10c23dd212a6abcdff3f145630e2401
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests/auto')
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/testlib/selftests/expected_assert.junitxml b/tests/auto/testlib/selftests/expected_assert.junitxml index ca12a45e20..2250293597 100644 --- a/tests/auto/testlib/selftests/expected_assert.junitxml +++ b/tests/auto/testlib/selftests/expected_assert.junitxml @@ -8,7 +8,7 @@ <testcase result="pass" name="initTestCase"/> <testcase result="pass" name="testNumber1"/> <testcase result="fail" name="testNumber2"> - <!-- message="ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 53" type="qfatal" --> + <!-- message="ASSERT: "false" in file qtbase/tests/auto/testlib/selftests/assert/tst_assert.cpp, line 0" type="qfatal" --> <failure message="Received a fatal error." result="fail"/> </testcase> <system-err> diff --git a/tests/auto/testlib/selftests/expected_faildatatype.junitxml b/tests/auto/testlib/selftests/expected_faildatatype.junitxml index fcc0db3892..320ece4994 100644 --- a/tests/auto/testlib/selftests/expected_faildatatype.junitxml +++ b/tests/auto/testlib/selftests/expected_faildatatype.junitxml @@ -8,7 +8,7 @@ <testcase result="pass" name="initTestCase"/> <testcase result="fail" name="value"> <!-- message="expected data of type 'QString', got 'bool' for element 0 of data with tag 'bool-as-string'" type="qdebug" --> - <!-- message="ASSERT: "false" in file qtbase/src/testlib/qtestdata.cpp, line 92" type="qfatal" --> + <!-- message="ASSERT: "false" in file qtbase/src/testlib/qtestdata.cpp, line 0" type="qfatal" --> <failure message="Received a fatal error." result="fail"/> </testcase> <system-err> diff --git a/tests/auto/testlib/selftests/generate_expected_output.py b/tests/auto/testlib/selftests/generate_expected_output.py index 1b8e1d3b8e..73b3d78d70 100755 --- a/tests/auto/testlib/selftests/generate_expected_output.py +++ b/tests/auto/testlib/selftests/generate_expected_output.py @@ -104,7 +104,7 @@ class Cleaner (object): (r'( *<QtBuild)>[^<]+</QtBuild>', r'\1/>'), # xml, lightxml (r'(<property value=")[^"]+(" name="QtBuild"/>)', r'\1\2'), # junitxml # Line numbers in source files: - (r'(ASSERT: ".*" in file .*, line) \d+', r'\1 0'), # lightxml + (r'(ASSERT: ("|").*("|") in file .*, line) \d+', r'\1 0'), # lightxml (r'(Loc: \[[^[\]()]+)\(\d+\)', r'\1(0)'), # txt (r'(\[Loc: [^[\]()]+)\(\d+\)', r'\1(0)'), # teamcity (r'(<(?:Incident|Message)\b.*\bfile=.*\bline=)"\d+"', r'\1"0"'), # lightxml, xml |