Browse Source

Tests/RunCMake/GoogleTest: Match discovery timeout message more precisely

Brad King 4 days ago
parent
commit
d3cfc57f06

+ 3 - 2
Tests/RunCMake/GoogleTest/GoogleTest-discovery-POST_BUILD-timeout-build-stdout.txt

@@ -1,7 +1,8 @@
-( *|[0-9]+>)CMake Error at .*GoogleTestAddTests\.cmake:[0-9]+ \(message\):
+( *|[0-9]+>)CMake Error at [^
+]*GoogleTestAddTests\.cmake:[0-9]+ \(message\):
 ( *|[0-9]+>)  Error running test executable\.
 ?( *|[0-9]+>)
-( *|[0-9]+>)    Path: '.*discovery_timeout_test(\.exe)?'
+( *|[0-9]+>)    Path: '[^']*discovery_timeout_test(\.exe)?'
 ( *|[0-9]+>)    Working directory: '[^']*/Tests/RunCMake/GoogleTest/GoogleTest-discovery-timeout'
 ( *|[0-9]+>)    Result: Process terminated due to timeout
 ( *|[0-9]+>)    Output:

+ 3 - 2
Tests/RunCMake/GoogleTest/GoogleTest-discovery-PRE_TEST-timeout-test-stderr.txt

@@ -1,7 +1,8 @@
-CMake Error at .*GoogleTestAddTests\.cmake:[0-9]+ \(message\):
+CMake Error at [^
+]*GoogleTestAddTests\.cmake:[0-9]+ \(message\):
 [ \t]*Error running test executable\.
 +
-[ \t]*Path: '.*discovery_timeout_test(\.exe)?'
+[ \t]*Path: '[^']*discovery_timeout_test(\.exe)?'
 [ \t]*Working directory: '[^']*/Tests/RunCMake/GoogleTest/GoogleTest-discovery-timeout'
 [ \t]*Result: Process terminated due to timeout
 [ \t]*Output: