From 1aefa86c31c10e2b735ba0bd531f2578c2361bec Mon Sep 17 00:00:00 2001 From: "william.r.dieter" Date: Fri, 29 Jan 2021 12:16:24 -0500 Subject: Tests: Accept line breaks in more places in dpkg-shlibdeps error message The RunCPackVerifyResult-shlibdeps-with-private-lib-failure test failed intermittently due to sometimes breaking lines in its output in different places. This change accepts line breaks in more places in the command output. Signed-off-by: william.r.dieter --- .../RunCPackVerifyResult-shlibdeps-with-private-lib-failure.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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() -- cgit v0.12