mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-11 00:11:07 -06:00
Code Issues Packages Projects Releases Wiki Activity

CPack/RPM: DIST-MONOLITHIC-type subtest fix

Browse Source 
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
This commit is contained in:
Domen Vrankar
2017-10-29 00:53:46 +02:00
committed by Brad King
parent a91eb5e41f
commit 9ce00caee3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake
View File

@@ -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_}'")