diff options
| author | Brad King <brad.king@kitware.com> | 2017-10-30 12:52:45 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-10-30 12:52:48 (GMT) |
| commit | e48397ee2930090ff41c8febeea27542b4580ec0 (patch) | |
| tree | bd6365e37100d2166336e05de4994971aec58086 /Tests/RunCMake | |
| parent | a7b770686a2aede19f1714c38a3a7697d8c798ee (diff) | |
| parent | 9ce00caee3639cda96ea7bc0310d6fa0aad7631b (diff) | |
| download | CMake-e48397ee2930090ff41c8febeea27542b4580ec0.zip CMake-e48397ee2930090ff41c8febeea27542b4580ec0.tar.gz CMake-e48397ee2930090ff41c8febeea27542b4580ec0.tar.bz2 | |
Merge topic 'cpack-rpm-dist-test-fix'
9ce00cae CPack/RPM: DIST-MONOLITHIC-type subtest fix
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1424
Diffstat (limited to 'Tests/RunCMake')
| -rw-r--r-- | Tests/RunCMake/CPack/tests/DIST/VerifyResult.cmake | 5 |
1 files changed, 5 insertions, 0 deletions
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_}'") |