mirror of
https://github.com/Kitware/CMake.git
synced 2026-03-09 10:00:12 -05:00
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`.
This commit is contained in:
@@ -1 +1,2 @@
|
|||||||
^(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(\.exe)?
|
||||||
Debug/discovery_timeout_test_NOT_BUILT
|
Debug/discovery_timeout_test_NOT_BUILT
|
||||||
Debug/discovery_timeout_test_NOT_BUILT(\.exe)?
|
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
|
0% tests passed, 1 tests failed out of 1
|
||||||
+
|
+
|
||||||
Total Test time \(real\) = +[0-9.]+ sec
|
Total Test time \(real\) = +[0-9.]+ sec
|
||||||
+
|
+
|
||||||
The following tests FAILED:
|
The following tests FAILED:
|
||||||
[^\n]+discovery_timeout_test_NOT_BUILT \(Not Run\)
|
[^
|
||||||
|
]+discovery_timeout_test_NOT_BUILT \(Not Run\)
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
Test project .*GoogleTest-build
|
Test project .*GoogleTest-build
|
||||||
[ \t]*Start [0-9]+: property_timeout.case_no_discovery
|
[ \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
|
0% tests passed, 1 tests failed out of 1
|
||||||
+
|
+
|
||||||
Total Test time \(real\) = +[0-9.]+ sec
|
Total Test time \(real\) = +[0-9.]+ sec
|
||||||
+
|
+
|
||||||
The following tests FAILED:
|
The following tests FAILED:
|
||||||
[^\n]*property_timeout.case_no_discovery \(Timeout\)
|
[^
|
||||||
|
]*property_timeout.case_no_discovery \(Timeout\)
|
||||||
|
|||||||
@@ -1,10 +1,12 @@
|
|||||||
Test project .*GoogleTest-build
|
Test project .*GoogleTest-build
|
||||||
[ \t]*Start [0-9]+: property_timeout.case_with_discovery
|
[ \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
|
0% tests passed, 1 tests failed out of 1
|
||||||
+
|
+
|
||||||
Total Test time \(real\) = +[0-9.]+ sec
|
Total Test time \(real\) = +[0-9.]+ sec
|
||||||
+
|
+
|
||||||
The following tests FAILED:
|
The following tests FAILED:
|
||||||
[^\n]*property_timeout.case_with_discovery \(Timeout\)
|
[^
|
||||||
|
]*property_timeout.case_with_discovery \(Timeout\)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- sub
|
-- sub
|
||||||
-- top$
|
-- top$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- sub
|
-- sub
|
||||||
-- top$
|
-- top$
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- top$
|
-- top$
|
||||||
|
|||||||
@@ -1,2 +1,3 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- top$
|
-- top$
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- Install component: "Unspecified"
|
-- Install component: "Unspecified"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
^-- Install configuration: "[^\n]*"
|
^-- Install configuration: "[^
|
||||||
|
]*"
|
||||||
-- top
|
-- top
|
||||||
-- sub$
|
-- sub$
|
||||||
|
|||||||
Reference in New Issue
Block a user