Tests/RunCMake: Match 'Tried extensions' output more robustly

This commit is contained in:
Brad King
2023-03-09 14:26:20 -05:00
parent b6ffbffaf2
commit 8c96d145c1
10 changed files with 29 additions and 34 deletions

View File

@@ -3,11 +3,9 @@
noexist noexist
Tried extensions [^ Tried extensions ([^
]* ]+
[^ )+Call Stack \(most recent call first\):
]*
Call Stack \(most recent call first\):
CMP0115-OLD\.cmake:[0-9]+ \(include\) CMP0115-OLD\.cmake:[0-9]+ \(include\)
CMakeLists\.txt:[0-9]+ \(include\) CMakeLists\.txt:[0-9]+ \(include\)

View File

@@ -17,11 +17,9 @@ CMake Error at CMP0115\.cmake:[0-9]+ \(add_executable\):
noexist noexist
Tried extensions [^ Tried extensions ([^
]* ]+
[^ )+Call Stack \(most recent call first\):
]*
Call Stack \(most recent call first\):
CMP0115-WARN\.cmake:[0-9]+ \(include\) CMP0115-WARN\.cmake:[0-9]+ \(include\)
CMakeLists\.txt:[0-9]+ \(include\) CMakeLists\.txt:[0-9]+ \(include\)

View File

@@ -3,9 +3,9 @@
.*\/relative-output-NEW\.c .*\/relative-output-NEW\.c
Tried extensions \.c \.C.* Tried extensions ([^
Call Stack \(most recent call first\): ]+
)+Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\) CMakeLists.txt:[0-9]+ \(include\)
+
CMake Generate step failed. Build files cannot be regenerated correctly.$ CMake Generate step failed. Build files cannot be regenerated correctly.$

View File

@@ -1,5 +1,5 @@
enable_language(C) enable_language(C)
add_library(foo) add_library(foo empty.c)
cmake_policy(SET CMP0070 NEW) cmake_policy(SET CMP0070 NEW)
file(GENERATE OUTPUT relative-output-NEW.c CONTENT "") file(GENERATE OUTPUT relative-output-NEW.c CONTENT "")

View File

@@ -8,16 +8,15 @@
behavior and not rely on setting a policy to OLD. behavior and not rely on setting a policy to OLD.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\) CMakeLists.txt:[0-9]+ \(include\)
+
CMake Error at SourceProperty-CMP0070-OLD.cmake:[0-9]+ \(target_sources\): CMake Error at SourceProperty-CMP0070-OLD.cmake:[0-9]+ \(target_sources\):
Cannot find source file: Cannot find source file:
.*\/relative-output-OLD\.c .*\/relative-output-OLD\.c
Tried extensions \.c \.C.* Tried extensions ([^
Call Stack \(most recent call first\): ]+
)+Call Stack \(most recent call first\):
CMakeLists.txt:[0-9]+ \(include\) CMakeLists.txt:[0-9]+ \(include\)
+
CMake Generate step failed. Build files cannot be regenerated correctly.$ CMake Generate step failed. Build files cannot be regenerated correctly.$

View File

@@ -1,5 +1,5 @@
enable_language(C) enable_language(C)
add_library(foo) add_library(foo empty.c)
cmake_policy(SET CMP0070 OLD) cmake_policy(SET CMP0070 OLD)
file(GENERATE OUTPUT relative-output-OLD.c CONTENT "") file(GENERATE OUTPUT relative-output-OLD.c CONTENT "")

View File

@@ -3,7 +3,7 @@ CMake Error at global-interface.cmake:2 \(add_library\):
GLOBAL GLOBAL
Tried extensions \.c \.C .* Tried extensions ([^
.* ]+
Call Stack \(most recent call first\): )+Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)

View File

@@ -3,7 +3,7 @@ CMake Error at MissingSource.cmake:1 \(add_library\):
missing.c missing.c
Tried extensions \.c \.C .* Tried extensions ([^
.* ]+
Call Stack \(most recent call first\): )+Call Stack \(most recent call first\):
CMakeLists.txt:3 \(include\) CMakeLists.txt:3 \(include\)

View File

@@ -3,9 +3,9 @@ CMake Error at FileSetDirect.cmake:3 \(add_library\):
FILE_SET FILE_SET
Tried extensions .c .C .c\+\+ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .h Tried extensions ([^
.hh .h\+\+ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc ]+
)+
Hint: the FILE_SET keyword may only appear after a visibility specifier or Hint: the FILE_SET keyword may only appear after a visibility specifier or
another FILE_SET within the target_sources\(\) command. another FILE_SET within the target_sources\(\) command.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):

View File

@@ -3,9 +3,9 @@ CMake Error at FileSetWrongSyntax.cmake:4 \(target_sources\):
FILE_SET FILE_SET
Tried extensions .c .C .c\+\+ .cc .cpp .cxx .cu .mpp .m .M .mm .ixx .cppm .h Tried extensions ([^
.hh .h\+\+ .hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .hip .ispc ]+
)+
Hint: the FILE_SET keyword may only appear after a visibility specifier or Hint: the FILE_SET keyword may only appear after a visibility specifier or
another FILE_SET within the target_sources\(\) command. another FILE_SET within the target_sources\(\) command.
Call Stack \(most recent call first\): Call Stack \(most recent call first\):