From fc4d238d7afee29e9495c5b1826af314fb8b3afe Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 2 Oct 2025 14:05:23 -0400 Subject: [PATCH] Tests: Match RunCMake.find_package-CPS version candidates more precisely Since commit 3e6466eb16 (find_package: Honor version requests when finding CPS packages, 2025-02-12, v4.0.0-rc1~16^2) the test has relied on `.*` to absorb capitalized paths on case-insensitive filesystems. Match them explicitly. --- .../find_package-CPS/MissingVersion1-stderr.txt | 14 +++++++++----- .../find_package-CPS/MissingVersion2-stderr.txt | 14 +++++++++----- .../find_package-CPS/VersionLimit3-stderr.txt | 14 +++++++++----- .../find_package-CPS/VersionLimit4-stderr.txt | 14 +++++++++----- 4 files changed, 36 insertions(+), 20 deletions(-) diff --git a/Tests/RunCMake/find_package-CPS/MissingVersion1-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingVersion1-stderr.txt index 76879a2468..b3bfd9bde2 100644 --- a/Tests/RunCMake/find_package-CPS/MissingVersion1-stderr.txt +++ b/Tests/RunCMake/find_package-CPS/MissingVersion1-stderr.txt @@ -3,11 +3,15 @@ CMake Error at MissingVersion1\.cmake:[0-9]+ \(find_package\): with requested version "1\.2\.7"\. The following configuration files were considered but not accepted: - - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov +( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+ Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) diff --git a/Tests/RunCMake/find_package-CPS/MissingVersion2-stderr.txt b/Tests/RunCMake/find_package-CPS/MissingVersion2-stderr.txt index c984ce72ba..cdb3a8d406 100644 --- a/Tests/RunCMake/find_package-CPS/MissingVersion2-stderr.txt +++ b/Tests/RunCMake/find_package-CPS/MissingVersion2-stderr.txt @@ -3,11 +3,15 @@ CMake Error at MissingVersion2\.cmake:[0-9]+ \(find_package\): with requested version "1\.4\.9"\. The following configuration files were considered but not accepted: - - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov +( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+ Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) diff --git a/Tests/RunCMake/find_package-CPS/VersionLimit3-stderr.txt b/Tests/RunCMake/find_package-CPS/VersionLimit3-stderr.txt index 3b1c5efa6c..e11db59f93 100644 --- a/Tests/RunCMake/find_package-CPS/VersionLimit3-stderr.txt +++ b/Tests/RunCMake/find_package-CPS/VersionLimit3-stderr.txt @@ -3,11 +3,15 @@ CMake Error at VersionLimit3\.cmake:[0-9]+ \(find_package\): with requested version range "1\.2\.0\.\.\.1\.2\.2"\. The following configuration files were considered but not accepted: - - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov +( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+ Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\) diff --git a/Tests/RunCMake/find_package-CPS/VersionLimit4-stderr.txt b/Tests/RunCMake/find_package-CPS/VersionLimit4-stderr.txt index 67cef1528d..3ae8004310 100644 --- a/Tests/RunCMake/find_package-CPS/VersionLimit4-stderr.txt +++ b/Tests/RunCMake/find_package-CPS/VersionLimit4-stderr.txt @@ -3,11 +3,15 @@ CMake Error at VersionLimit4\.cmake:[0-9]+ \(find_package\): with requested version range "1\.2\.0\.\.\.<1\.2\.3"\. The following configuration files were considered but not accepted: - - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/sample\.cps, version: 1\.5\.0\+niven - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/sample\.cps, version: 1\.4\.2\+adams - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/sample\.cps, version: 1\.2\.3\+clarke - .*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/sample\.cps, version: 1\.1\.0\+asimov +( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.5\.0/[Ss]ample\.cps, version: 1\.5\.0\+niven)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.4\.2/[Ss]ample\.cps, version: 1\.4\.2\+adams)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.2\.3/[Ss]ample\.cps, version: 1\.2\.3\+clarke)+( + [^ +]*/Tests/RunCMake/find_package-CPS/cps/sample/1\.1\.0/[Ss]ample\.cps, version: 1\.1\.0\+asimov)+ Call Stack \(most recent call first\): CMakeLists\.txt:3 \(include\)