diff options
| author | Kyle Edwards <kyle.edwards@kitware.com> | 2020-01-10 20:14:00 (GMT) |
|---|---|---|
| committer | Kyle Edwards <kyle.edwards@kitware.com> | 2020-01-10 22:22:52 (GMT) |
| commit | d491f34a5ef303217aef335fdc02a8ff987a6fc8 (patch) | |
| tree | 5bab71882bde0ef9f87b02463dfda3adf5168fa5 /Tests/CPackComponentsDEB | |
| parent | 9fa8b7d5dda04b94fe04e63626e393fd6bf0353e (diff) | |
| download | CMake-d491f34a5ef303217aef335fdc02a8ff987a6fc8.zip CMake-d491f34a5ef303217aef335fdc02a8ff987a6fc8.tar.gz CMake-d491f34a5ef303217aef335fdc02a8ff987a6fc8.tar.bz2 | |
CPack: Fix regression in DEB generator description
Fixes: #20102
Diffstat (limited to 'Tests/CPackComponentsDEB')
| -rw-r--r-- | Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake | 5 | ||||
| -rw-r--r-- | Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake index 86a74b2..f46a575 100644 --- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake +++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake @@ -65,9 +65,10 @@ if(DPKGDEB_EXECUTABLE) "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: `${dpkg_description}` != `${expected_description}`") endif() elseif(dpkg_package_name STREQUAL "mylib-libraries") - if(NOT dpkg_description MATCHES "main description\n.*") + set(expected_description "main description") + if(NOT dpkg_description STREQUAL expected_description) set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all} - "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: `${dpkg_description}` =~ `main description.*`") + "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: `${dpkg_description}` != `${expected_description}`") endif() else() set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all} diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake index d53c73d..c00921a 100644 --- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake +++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description2.cmake @@ -53,9 +53,10 @@ if(DPKGDEB_EXECUTABLE) message(STATUS "package='${dpkg_package_name}', description='${dpkg_description}'") if(dpkg_package_name STREQUAL "mylib-applications" OR dpkg_package_name STREQUAL "mylib-headers") - if(NOT dpkg_description MATCHES "main description 2\n.*") + set(expected_description "main description 2") + if(NOT dpkg_description STREQUAL expected_description) set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all} - "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: `${dpkg_description}` =~ `main description 2`") + "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: `${dpkg_description}` != `${expected_description}`") endif() elseif(dpkg_package_name STREQUAL "mylib-libraries") set(expected_description "main description 2\n library description") |