Tests: Enforce RunCMake.CXXModules no-modules-support diagnostics strictly

Previously the expected output expressions used `(...)*` which did not
actually have to match anything.

6 files changed, 26 insertions, 36 deletions

diff --git a/Tests/RunCMake/CXXModules/CMP0155-NEW-stderr.txt b/Tests/RunCMake/CXXModules/CMP0155-NEW-stderr.txt
index 39575d4..d103201 100644
--- a/Tests/RunCMake/CXXModules/CMP0155-NEW-stderr.txt
+++ b/Tests/RunCMake/CXXModules/CMP0155-NEW-stderr.txt
@@ -1,8 +1,7 @@
 (CMake Error in CMakeLists.txt:
-(  The target named "cmp0155-new" has C\+\+ sources that use modules but the
+  The target named "cmp0155-new" has C\+\+ sources that use modules but the
   compiler does not provide a way to discover the import graph dependencies
-|  The target named "cmp0155-new" contains C\+\+ sources that use modules which
+|CMake Error in CMakeLists.txt:
+  The target named "cmp0155-new" contains C\+\+ sources that use modules which
   is not supported by the generator
 )
-)*
-CMake Generate step failed.  Build files cannot be regenerated correctly.
diff --git a/Tests/RunCMake/CXXModules/NoCXX-stderr.txt b/Tests/RunCMake/CXXModules/NoCXX-stderr.txt
index da65c26..accc622 100644
--- a/Tests/RunCMake/CXXModules/NoCXX-stderr.txt
+++ b/Tests/RunCMake/CXXModules/NoCXX-stderr.txt
@@ -1,13 +1,14 @@
 (CMake Error in CMakeLists.txt:
-(  The target named "nocxx" has C\+\+ sources that use modules but the "CXX"
+  The target named "nocxx" has C\+\+ sources that use modules but the "CXX"
   language has not been enabled
-|  The target named "nocxx" contains C\+\+ sources that use modules which is not
+|CMake Error in CMakeLists.txt:
+  The target named "nocxx" contains C\+\+ sources that use modules which is not
   supported by the generator
-|  Target "nocxx" has source file
+|CMake Error in CMakeLists.txt:
+  Target "nocxx" has source file
 
-    .*/Tests/RunCMake/CXXModules/sources/module.cxx
+    [^
+]*/Tests/RunCMake/CXXModules/sources/module.cxx
 
   in a "FILE_SET TYPE CXX_MODULES" but it is not scheduled for compilation.
 )
-)*
-CMake Generate step failed.  Build files cannot be regenerated correctly.
diff --git a/Tests/RunCMake/CXXModules/NoCXX20-stderr.txt b/Tests/RunCMake/CXXModules/NoCXX20-stderr.txt
index 5a9b6e7..c83e26d 100644
--- a/Tests/RunCMake/CXXModules/NoCXX20-stderr.txt
+++ b/Tests/RunCMake/CXXModules/NoCXX20-stderr.txt
@@ -1,9 +1,8 @@
 (CMake Error in CMakeLists.txt:
-(  The target named "nocxx20" has C\+\+ sources that use modules but does not
+  The target named "nocxx20" has C\+\+ sources that use modules but does not
   include "cxx_std_20" \(or newer\) among its `target_compile_features`; found
   "cxx_std_17"
-|  The target named "nocxx20" contains C\+\+ sources that use modules which is
+|CMake Error in CMakeLists.txt:
+  The target named "nocxx20" contains C\+\+ sources that use modules which is
   not supported by the generator
 )
-)*
-CMake Generate step failed.  Build files cannot be regenerated correctly.
diff --git a/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt b/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt
index 6a9c995..0ba2dde 100644
--- a/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt
+++ b/Tests/RunCMake/CXXModules/NoDyndepSupport-stderr.txt
@@ -1,18 +1,11 @@
-(CMake Error:
+^(CMake Error:
   The Ninja generator does not support C\+\+20 modules using Ninja version
 
-    .*
-
-  due to lack of required features.  Ninja 1.11 or higher is required.
+    [^
+]+
 
+  due to lack of required features\.  Ninja 1\.11 or higher is required\.
 |CMake Error in CMakeLists.txt:
   The target named "nodyndep" contains C\+\+ sources that use modules which is
   not supported by the generator
-
-(
-CMake Error in CMakeLists.txt:
-  The target named "nodyndep" contains C\+\+ sources that use modules which is
-  not supported by the generator
-
-)*)
-CMake Generate step failed.  Build files cannot be regenerated correctly.
+)
diff --git a/Tests/RunCMake/CXXModules/NoScanningSourceFileProperty-stderr.txt b/Tests/RunCMake/CXXModules/NoScanningSourceFileProperty-stderr.txt
index 464627c..d3edb21 100644
--- a/Tests/RunCMake/CXXModules/NoScanningSourceFileProperty-stderr.txt
+++ b/Tests/RunCMake/CXXModules/NoScanningSourceFileProperty-stderr.txt
@@ -1,9 +1,8 @@
 (CMake Error in CMakeLists.txt:
-(  The target named "noscanning-sf-property" has C\+\+ sources that use modules
+  The target named "noscanning-sf-property" has C\+\+ sources that use modules
   but the compiler does not provide a way to discover the import graph
   dependencies
-|  The target named "noscanning-sf-property" contains C\+\+ sources that use modules which
-  is not supported by the generator
+|CMake Error in CMakeLists.txt:
+  The target named "noscanning-sf-property" contains C\+\+ sources that use
+  modules which is not supported by the generator
 )
-)*
-CMake Generate step failed.  Build files cannot be regenerated correctly.
diff --git a/Tests/RunCMake/CXXModules/NoScanningTargetProperty-stderr.txt b/Tests/RunCMake/CXXModules/NoScanningTargetProperty-stderr.txt
index 72c7a0a..a18b98b 100644
--- a/Tests/RunCMake/CXXModules/NoScanningTargetProperty-stderr.txt
+++ b/Tests/RunCMake/CXXModules/NoScanningTargetProperty-stderr.txt
@@ -1,9 +1,8 @@
 (CMake Error in CMakeLists.txt:
-(  The target named "noscanning-target-property" has C\+\+ sources that use
+  The target named "noscanning-target-property" has C\+\+ sources that use
   modules but the compiler does not provide a way to discover the import
   graph dependencies
-|  The target named "noscanning-target-property" contains C\+\+ sources that use modules which
-  is not supported by the generator
+|CMake Error in CMakeLists.txt:
+  The target named "noscanning-target-property" contains C\+\+ sources that use
+  modules which is not supported by the generator
 )
-)*
-CMake Generate step failed.  Build files cannot be regenerated correctly.