From 9ce00caee3639cda96ea7bc0310d6fa0aad7631b Mon Sep 17 00:00:00 2001 From: Domen Vrankar Date: Sun, 29 Oct 2017 00:53:46 +0200 Subject: CPack/RPM: DIST-MONOLITHIC-type subtest fix Test was failing in case dist macro contained a + symbol which is valid but must be escaped for using the string as a regex. Fixes #17328 --- Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake index 7375ecc..1b2eb48 100644 --- a/Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake @@ -5,6 +5,11 @@ execute_process(COMMAND ${RPMBUILD_EXECUTABLE} -E %{?dist} set(whitespaces_ "[\t\n\r ]*") +# since we have no control over dist tag value we should try to escape +# the content for use as a regular expression +string(REPLACE "+" "\\+" DIST_TAG "${DIST_TAG}") +string(REPLACE "." "\\." DIST_TAG "${DIST_TAG}") + getPackageInfo("${FOUND_FILE_1}" "FILE_INFO_") if(NOT FILE_INFO_ MATCHES ".*Release${whitespaces_}:${whitespaces_}1${DIST_TAG}") message(FATAL_ERROR "Unexpected Release in '${FOUND_FILE_1}'; file info: '${FILE_INFO_}'") -- cgit v0.12