diff options
| author | Domen Vrankar <domen.vrankar@gmail.com> | 2017-03-25 18:13:08 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-03-27 13:08:24 (GMT) |
| commit | 4ba065b22b544a509c76e497306b65e2dc0d5ee7 (patch) | |
| tree | e98547469951e491f49966cda8ecf40d76549547 /Tests/RunCMake/CPack/tests/SOURCE_PACKAGE | |
| parent | 9f37f94d639aa4a5cc42a2f60fafb51bed317e1b (diff) | |
| download | CMake-4ba065b22b544a509c76e497306b65e2dc0d5ee7.zip CMake-4ba065b22b544a509c76e497306b65e2dc0d5ee7.tar.gz CMake-4ba065b22b544a509c76e497306b65e2dc0d5ee7.tar.bz2 | |
CPack/RPM tests: handle build-id links
Build id links generation was introduced
in rpm 4.13.0.1 so files related to them
should be ignored as they are not relevant
for the tests.
Fixes #16710
Diffstat (limited to 'Tests/RunCMake/CPack/tests/SOURCE_PACKAGE')
| -rw-r--r-- | Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/VerifyResult.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/VerifyResult.cmake index bc54d79..73d7481 100644 --- a/Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/tests/SOURCE_PACKAGE/VerifyResult.cmake @@ -21,7 +21,9 @@ execute_process(COMMAND ${RPMBUILD_EXECUTABLE} --define "_topdir ${CMAKE_CURRENT set(output_error_message_ "\n${RPMBUILD_EXECUTABLE} error: '${error_}';\nresult: '${result_}';\n${output_error_message}") -set(EXPECTED_FILE_CONTENT_ "^/foo${whitespaces_}/foo/test_prog$") +# expected file content are test_prog and optional build-id links that are +# generated by rpmbuild (introduced in rpm 4.13.0.1) +set(EXPECTED_FILE_CONTENT_ "^/foo${whitespaces_}/foo/test_prog(${whitespaces_}.*\.build-id.*)*$") file(GLOB_RECURSE FOUND_FILE_ RELATIVE "${CMAKE_CURRENT_BINARY_DIR}/test_rpm/RPMS" "${CMAKE_CURRENT_BINARY_DIR}/test_rpm/RPMS/*.rpm") list(APPEND foundFiles_ "${FOUND_FILE_}") |