From abab3c5dadd7fb80c2807f061e4d6aa7724c78c8 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Mon, 1 Aug 2022 16:56:46 +0200 Subject: Fix error in TAP test logger's regex to recognize QVERIFY() output The regex used a greedy .+ to match an actual dot and a space, preceding an open parenthesis, with the result that if the message contained any parentheses that .+ swallowed everything up to the last of them. Correct the regex so that recently-added tests' error messages show up correctly. Change-Id: I6e52c9b2a6e7959335fcddbb4266f65b589eba68 Reviewed-by: Jason McDonald --- tests/auto/testlib/selftests/expected_cmptest.tap | 2 +- tests/auto/testlib/selftests/expected_eventloop.tap | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'tests/auto/testlib/selftests') diff --git a/tests/auto/testlib/selftests/expected_cmptest.tap b/tests/auto/testlib/selftests/expected_cmptest.tap index 65b0504be4..368d3aafb4 100644 --- a/tests/auto/testlib/selftests/expected_cmptest.tap +++ b/tests/auto/testlib/selftests/expected_cmptest.tap @@ -547,7 +547,7 @@ not ok 65 - verify() not ok 66 - verify2() --- type: QVERIFY - message: as expected, in fact) + message: 42 >= 2 (as expected, in fact) wanted: true (opaqueFunc() < 2) found: false (opaqueFunc() < 2) expected: true (opaqueFunc() < 2) diff --git a/tests/auto/testlib/selftests/expected_eventloop.tap b/tests/auto/testlib/selftests/expected_eventloop.tap index 85f48a13a1..84036e6dec 100644 --- a/tests/auto/testlib/selftests/expected_eventloop.tap +++ b/tests/auto/testlib/selftests/expected_eventloop.tap @@ -11,7 +11,7 @@ not ok 2 - fail() not ok 2 - fail() --- type: QVERIFY - message: ) + message: QTestEventLoop exited prematurely in cleanup() wanted: true (loop.timeout()) found: false (loop.timeout()) expected: true (loop.timeout()) @@ -35,7 +35,7 @@ not ok 3 - skip() not ok 3 - skip() --- type: QVERIFY - message: ) + message: QTestEventLoop exited prematurely in cleanup() wanted: true (loop.timeout()) found: false (loop.timeout()) expected: true (loop.timeout()) @@ -59,7 +59,7 @@ not ok 4 - pass() not ok 4 - pass() --- type: QVERIFY - message: ) + message: QTestEventLoop exited prematurely in cleanup() wanted: true (loop.timeout()) found: false (loop.timeout()) expected: true (loop.timeout()) -- cgit v1.2.3