mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-06 04:03:27 +03:00
Code Activity

Tests: Simplify and improve RunCMake/find_package-CPS tests

Browse Source 
Refactor common logic out of individual RunCMake/find_package-CPS tests.
Move enabling the experimental gate to the RunCMakeTest.cmake, add a
separate test to verify the experimental warning, and suppress it
everywhere else. This will greatly simplify writing non-failure tests.
This commit is contained in:
Matthew Woehlke authored and Brad King committed 2025-02-06 15:23:09 -05:00
1 parent 619c1bacfd
commit 5ae2596027
10 files changed
+61 -73
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Tests/RunCMake/find_package-CPS/ExperimentalWarning-stderr.txt
+27
View File
@@ -0,0 +1,27 @@
CMake Warning \(dev\) at ExperimentalWarning\.cmake:[0-9]+ \(find_package\):
CMake's support for importing package information in the Common Package
Specification format \(via find_package\) is experimental\. It is meant only
for experimentation and feedback to CMake developers\.
Call Stack \(most recent call first\):
CMakeLists\.txt:3 \(include\)
This warning is for project developers\. Use -Wno-dev to suppress it\.
CMake Warning at ExperimentalWarning\.cmake:[0-9]+ \(find_package\):
By not providing "FindDoesNotExist\.cmake" in CMAKE_MODULE_PATH this project
has asked CMake to find a package configuration file provided by
"DoesNotExist", but CMake did not find one\.
Could not find a package configuration file provided by "DoesNotExist" with
any of the following names:
DoesNotExist\.cps
doesnotexist\.cps
DoesNotExistConfig\.cmake
doesnotexist-config\.cmake
Add the installation prefix of "DoesNotExist" to CMAKE_PREFIX_PATH or set
"DoesNotExist_DIR" to a directory containing one of the above files\. If
"DoesNotExist" provides a separate development package or SDK, be sure it
has been installed\.
Call Stack \(most recent call first\):
CMakeLists\.txt:3 \(include\)
Tests/RunCMake/find_package-CPS/ExperimentalWarning.cmake
+10
View File
@@ -0,0 +1,10 @@
cmake_minimum_required(VERSION 4.0)
set(
CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES
"e82e467b-f997-4464-8ace-b00808fff261"
)
include(Setup.cmake)
find_package(DoesNotExist)
Tests/RunCMake/find_package-CPS/MissingComponent.cmake
+1 -13
View File
@@ -1,18 +1,6 @@
cmake_minimum_required(VERSION 4.0)
set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261")
# Protect tests from running inside the default install prefix.
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
# Disable built-in search paths.
set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF)
set(CMAKE_FIND_USE_INSTALL_PREFIX OFF)
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include(Setup.cmake)
###############################################################################
# Test requesting unavailable components from a package.
Tests/RunCMake/find_package-CPS/MissingComponentDependency.cmake
+1 -13
View File
@@ -1,18 +1,6 @@
cmake_minimum_required(VERSION 4.0)
set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261")
# Protect tests from running inside the default install prefix.
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
# Disable built-in search paths.
set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF)
set(CMAKE_FIND_USE_INSTALL_PREFIX OFF)
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include(Setup.cmake)
###############################################################################
# Test requesting components with missing dependencies from a package.
Tests/RunCMake/find_package-CPS/MissingTransitiveComponent.cmake
+1 -13
View File
@@ -1,18 +1,6 @@
cmake_minimum_required(VERSION 4.0)
set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261")
# Protect tests from running inside the default install prefix.
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
# Disable built-in search paths.
set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF)
set(CMAKE_FIND_USE_INSTALL_PREFIX OFF)
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include(Setup.cmake)
###############################################################################
# Test depending on components of another package which are unavailable.
Tests/RunCMake/find_package-CPS/MissingTransitiveComponentDependency.cmake
+1 -13
View File
@@ -1,18 +1,6 @@
cmake_minimum_required(VERSION 4.0)
set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261")
# Protect tests from running inside the default install prefix.
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
# Disable built-in search paths.
set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF)
set(CMAKE_FIND_USE_INSTALL_PREFIX OFF)
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include(Setup.cmake)
###############################################################################
# Test depending on components of another package which are missing
Tests/RunCMake/find_package-CPS/MissingTransitiveDependency-stderr.txt
-8
View File
@@ -1,11 +1,3 @@
CMake Warning \(dev\) at MissingTransitiveDependency\.cmake:[0-9]+ \(find_package\):
CMake's support for importing package information in the Common Package
Specification format \(via find_package\) is experimental\. It is meant only
for experimentation and feedback to CMake developers.
Call Stack \(most recent call first\):
CMakeLists\.txt:[0-9]+ \(include\)
This warning is for project developers. Use -Wno-dev to suppress it.
+
CMake Error in cps/[Ss]till[Ii]ncomplete\.cps:
Could not find a package configuration file provided by "DoesNotExist" with
any of the following names:
Tests/RunCMake/find_package-CPS/MissingTransitiveDependency.cmake
+1 -13
View File
@@ -1,18 +1,6 @@
cmake_minimum_required(VERSION 4.0)
set(CMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES "e82e467b-f997-4464-8ace-b00808fff261")
# Protect tests from running inside the default install prefix.
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
# Disable built-in search paths.
set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF)
set(CMAKE_FIND_USE_INSTALL_PREFIX OFF)
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})
include(Setup.cmake)
###############################################################################
# Test finding a package that is missing dependencies.
Tests/RunCMake/find_package-CPS/RunCMakeTest.cmake
+8
View File
@@ -1,5 +1,13 @@
include(RunCMake)
run_cmake(ExperimentalWarning)
# Enable experimental feature and suppress warnings
set(RunCMake_TEST_OPTIONS
-Wno-dev
"-DCMAKE_EXPERIMENTAL_FIND_CPS_PACKAGES:STRING=e82e467b-f997-4464-8ace-b00808fff261"
)
run_cmake(MissingTransitiveDependency)
run_cmake(MissingComponent)
run_cmake(MissingComponentDependency)
Tests/RunCMake/find_package-CPS/Setup.cmake
+11
View File
@@ -0,0 +1,11 @@
# Protect tests from running inside the default install prefix.
set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_BINARY_DIR}/NotDefaultPrefix")
# Disable built-in search paths.
set(CMAKE_FIND_USE_PACKAGE_ROOT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH OFF)
set(CMAKE_FIND_USE_CMAKE_SYSTEM_PATH OFF)
set(CMAKE_FIND_USE_INSTALL_PREFIX OFF)
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_SOURCE_DIR})