Skip to content
Snippets Groups Projects
Commit 3ede66e1 authored by Brad King's avatar Brad King
Browse files

Tests: Fix newline matching in several RunCMake.* cases

The RunCMake infrastructure's `*-stdout.txt` expected output files
interpret `\n` as a `\` and `n` rather than a newline.  Use a literal
newline instead.  Otherwise the cases that were trying to match any
configuration name via `[^\n]*` would fail on `RelWithDebInfo` because
it contains the letter `n`.
parent 6372e74e
No related branches found
No related tags found
No related merge requests found
Showing
with 42 additions and 21 deletions
^(CPackRPM: Will use GENERATED spec file: (/[^/]*)*/Tests/RunCMake/RPM\.[^/]*/CPack/[^-]*(-package-target)?-build((-[^-]*-subtest/)|/)_CPack_Packages/.*/RPM/SPECS/[^\.]*\.spec(\n|$))*$
^(CPackRPM: Will use GENERATED spec file: (/[^/]*)*/Tests/RunCMake/RPM\.[^/]*/CPack/[^-]*(-package-target)?-build((-[^-]*-subtest/)|/)_CPack_Packages/.*/RPM/SPECS/[^\.]*\.spec(
|$))*$
......@@ -8,11 +8,13 @@ Debug/discovery_timeout_test_NOT_BUILT
Debug/discovery_timeout_test_NOT_BUILT(\.exe)?
Debug/discovery_timeout_test_NOT_BUILT
Debug/discovery_timeout_test_NOT_BUILT(\.exe)?
[^\n]+discovery_timeout_test_NOT_BUILT +\.+\*\*\*Not Run +[0-9.]+ sec
[^
]+discovery_timeout_test_NOT_BUILT +\.+\*\*\*Not Run +[0-9.]+ sec
+
0% tests passed, 1 tests failed out of 1
+
Total Test time \(real\) = +[0-9.]+ sec
+
The following tests FAILED:
[^\n]+discovery_timeout_test_NOT_BUILT \(Not Run\)
[^
]+discovery_timeout_test_NOT_BUILT \(Not Run\)
Test project .*GoogleTest-build
[ \t]*Start [0-9]+: property_timeout.case_no_discovery
[^\n]+property_timeout.case_no_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
[^
]+property_timeout.case_no_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
+
0% tests passed, 1 tests failed out of 1
+
Total Test time \(real\) = +[0-9.]+ sec
+
The following tests FAILED:
[^\n]*property_timeout.case_no_discovery \(Timeout\)
[^
]*property_timeout.case_no_discovery \(Timeout\)
Test project .*GoogleTest-build
[ \t]*Start [0-9]+: property_timeout.case_with_discovery
[^\n]+property_timeout.case_with_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
[^
]+property_timeout.case_with_discovery +\.+\*\*\*Timeout +[0-9.]+ sec
+
0% tests passed, 1 tests failed out of 1
+
Total Test time \(real\) = +[0-9.]+ sec
+
The following tests FAILED:
[^\n]*property_timeout.case_with_discovery \(Timeout\)
[^
]*property_timeout.case_with_discovery \(Timeout\)
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- sub
-- top$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- sub
-- top$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- top$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- top$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- Install component: "Unspecified"
-- top
-- sub$
^-- Install configuration: "[^\n]*"
^-- Install configuration: "[^
]*"
-- top
-- sub$
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment