-
Notifications
You must be signed in to change notification settings - Fork 2.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'gtest_discover_tests_timeout' into release-3.10
Merge-request: !1851
- Loading branch information
Showing
15 changed files
with
145 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
2 changes: 1 addition & 1 deletion
2
.../GoogleTest/GoogleTest-timeout-stdout.txt → ...t/GoogleTest-discovery-timeout-stdout.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
( *|[0-9]+>)CMake Error at .*GoogleTestAddTests.cmake:[0-9]+ \(message\): | ||
( *|[0-9]+>) Error running test executable. | ||
?( *|[0-9]+>) | ||
( *|[0-9]+>) Path: '.*timeout_test(\.exe)?' | ||
( *|[0-9]+>) Path: '.*discovery_timeout_test(\.exe)?' | ||
( *|[0-9]+>) Result: Process terminated due to timeout | ||
( *|[0-9]+>) Output: | ||
( *|[0-9]+>) + |
1 change: 1 addition & 0 deletions
1
Tests/RunCMake/GoogleTest/GoogleTest-property-timeout1-result.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
[^0] |
1 change: 1 addition & 0 deletions
1
Tests/RunCMake/GoogleTest/GoogleTest-property-timeout1-stderr.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Errors while running CTest |
10 changes: 10 additions & 0 deletions
10
Tests/RunCMake/GoogleTest/GoogleTest-property-timeout1-stdout.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
Test project .*GoogleTest-build | ||
[ \t]*Start [0-9]+: property_timeout.case_no_discovery | ||
[^\n]+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\) |
1 change: 1 addition & 0 deletions
1
Tests/RunCMake/GoogleTest/GoogleTest-property-timeout2-result.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
[^0] |
1 change: 1 addition & 0 deletions
1
Tests/RunCMake/GoogleTest/GoogleTest-property-timeout2-stderr.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Errors while running CTest |
10 changes: 10 additions & 0 deletions
10
Tests/RunCMake/GoogleTest/GoogleTest-property-timeout2-stdout.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
Test project .*GoogleTest-build | ||
[ \t]*Start [0-9]+: property_timeout.case_with_discovery | ||
[^\n]+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\) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
Unable to find executable: timeout_test_NOT_BUILT | ||
Unable to find executable: no_tests_defined_NOT_BUILT | ||
Errors while running CTest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
int main() | ||
{ | ||
return 0; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters