summaryrefslogtreecommitdiffstats
path: root/Tests
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2021-02-02 13:48:05 (GMT)
committerKitware Robot <kwrobot@kitware.com>2021-02-02 13:49:00 (GMT)
commit932b45ceb9b1c10cd6c5e4cf72f706e521273206 (patch)
tree75f324e4373bd1714a67d23ebd2d80550ad80f0c /Tests
parent1b5f4a615b57911ff982292a7ed9ea5e2a70c8b6 (diff)
parent1aefa86c31c10e2b735ba0bd531f2578c2361bec (diff)
downloadCMake-932b45ceb9b1c10cd6c5e4cf72f706e521273206.zip
CMake-932b45ceb9b1c10cd6c5e4cf72f706e521273206.tar.gz
CMake-932b45ceb9b1c10cd6c5e4cf72f706e521273206.tar.bz2
Merge topic 'shlibdeps-fixup'
1aefa86c31 Tests: Accept line breaks in more places in dpkg-shlibdeps error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5751
Diffstat (limited to 'Tests')
-rw-r--r--Tests/CPackComponentsDEB/RunCPackVerifyResult-shlibdeps-with-private-lib-failure.cmake2
1 files changed, 1 insertions, 1 deletions
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-shlibdeps-with-private-lib-failure.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-shlibdeps-with-private-lib-failure.cmake
index 547852d7..962a1fb 100644
--- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-shlibdeps-with-private-lib-failure.cmake
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-shlibdeps-with-private-lib-failure.cmake
@@ -13,7 +13,7 @@ run_cpack(actual_output
CONFIG_ARGS ${config_args}
CONFIG_VERBOSE ${config_verbose})
-string(REGEX MATCH "dpkg-shlibdeps: error: (cannot|couldn't) find library\n[ \t]*libmyprivatelib.so.1 needed by ./usr/bin/mylibapp3" expected_error ${CPack_error})
+string(REGEX MATCH "dpkg-shlibdeps: error: (cannot|couldn't) find[ \n\t]+library[ \n\t]+libmyprivatelib.so.1[ \n\t]+needed[ \n\t]+by[ \n\t]+./usr/bin/mylibapp3" expected_error ${CPack_error})
if(NOT expected_error)
message(FATAL_ERROR "Did not get the expected error-message!")
endif()