diff options
| author | Alex Turbov <i.zaufi@gmail.com> | 2019-07-11 16:31:59 (GMT) |
|---|---|---|
| committer | Alex Turbov <i.zaufi@gmail.com> | 2019-09-21 22:31:24 (GMT) |
| commit | 33c7ea513dc8a7e1322c5c37003c7c515bd8ad99 (patch) | |
| tree | 1b0f529e7083387374ecd536f24a9311a06be33b /Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake | |
| parent | 53be31e19c0dc0f517825d1be056c55d7729a4b7 (diff) | |
| download | CMake-33c7ea513dc8a7e1322c5c37003c7c515bd8ad99.zip CMake-33c7ea513dc8a7e1322c5c37003c7c515bd8ad99.tar.gz CMake-33c7ea513dc8a7e1322c5c37003c7c515bd8ad99.tar.bz2 | |
CPackDeb: Use `CPACK_PACKAGE_DESCRIPTION_FILE`
Also, handle per-component description nicely.
Diffstat (limited to 'Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake')
| -rw-r--r-- | Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake index f74137c..86a74b2 100644 --- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake +++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-description1.cmake @@ -48,26 +48,26 @@ if(DPKGDEB_EXECUTABLE) DPKGDEB_OUTPUT "${dpkg_output}" METAENTRY "Package:") - dpkgdeb_return_specific_metaentry(dpkg_description - DPKGDEB_OUTPUT "${dpkg_output}" - METAENTRY "Description:") + get_package_description("${dpkg_output}" dpkg_description) message(STATUS "package='${dpkg_package_name}', description='${dpkg_description}'") if(dpkg_package_name STREQUAL "mylib-applications") - if(NOT "${dpkg_description}" STREQUAL "applications_description") + set(expected_description "main description\n applications_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} != applications_description") + "dpkg-deb: ${_f}: Incorrect description for package ${dpkg_package_name}: `${dpkg_description}` != `${expected_description}`") endif() elseif(dpkg_package_name STREQUAL "mylib-headers") - if(NOT dpkg_description STREQUAL "headers_description") + set(expected_description "main description\n headers_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} != headers_description") + "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 STREQUAL "main description") + if(NOT dpkg_description MATCHES "main description\n.*") 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}` =~ `main description.*`") endif() else() set(dpkgdeb_output_errors_all ${dpkgdeb_output_errors_all} |