diff options
| author | Brad King <brad.king@kitware.com> | 2021-07-01 15:26:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-07-01 15:26:28 (GMT) |
| commit | 3a6cb03b6ce0322ddd12fadaa37f76a5ae670db2 (patch) | |
| tree | 856fc8c9d365dd30843c36ac94975125f3b8a7a4 /Tests/RunCMake/CPack | |
| parent | 5333ee1de4f93996d23fc8f1ae4ba87ad632bc51 (diff) | |
| parent | a0d3494afacc28ec75318470b806cea06e90eb99 (diff) | |
| download | CMake-3a6cb03b6ce0322ddd12fadaa37f76a5ae670db2.zip CMake-3a6cb03b6ce0322ddd12fadaa37f76a5ae670db2.tar.gz CMake-3a6cb03b6ce0322ddd12fadaa37f76a5ae670db2.tar.bz2 | |
Merge topic 'cpackdeb-md5sums-order'
a0d3494afa Tests: update MD5SUMS test to have several files
9028195a22 CPackDeb: sort package files before generating deb file
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !6287
Diffstat (limited to 'Tests/RunCMake/CPack')
| -rw-r--r-- | Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake | 3 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake index d1a3a5f..f859215 100644 --- a/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake +++ b/Tests/RunCMake/CPack/tests/MD5SUMS/ExpectedFiles.cmake @@ -1,2 +1,2 @@ set(EXPECTED_FILES_COUNT "1") -set(EXPECTED_FILE_CONTENT_1_LIST "/foo;/foo/CMakeLists.txt") +set(EXPECTED_FILE_CONTENT_1_LIST "/bar;/bar/CMakeLists.txt;/baz;/baz/CMakeLists.txt;/foo;/foo/CMakeLists.txt") diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake index fbdda9c..13af097 100644 --- a/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/tests/MD5SUMS/VerifyResult.cmake @@ -1,3 +1,4 @@ set(whitespaces_ "[\t\n\r ]*") -set(md5sums_md5sums "^.* usr/foo/CMakeLists\.txt${whitespaces_}$") +set(hashsyms_ "[a-f0-9]+") +set(md5sums_md5sums "^${hashsyms_} usr/bar/CMakeLists\.txt${whitespaces_}${hashsyms_} usr/baz/CMakeLists\.txt${whitespaces_}${hashsyms_} usr/foo/CMakeLists\.txt${whitespaces_}$") verifyDebControl("${FOUND_FILE_1}" "md5sums" "md5sums") diff --git a/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake index 15c5892..3c922d2 100644 --- a/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake +++ b/Tests/RunCMake/CPack/tests/MD5SUMS/test.cmake @@ -1,4 +1,6 @@ install(FILES CMakeLists.txt DESTINATION foo COMPONENT test) +install(FILES CMakeLists.txt DESTINATION bar COMPONENT test) +install(FILES CMakeLists.txt DESTINATION baz COMPONENT test) if(PACKAGING_TYPE STREQUAL "COMPONENT") set(CPACK_COMPONENTS_ALL test) |