diff options
author | Domen Vrankar <domen.vrankar@gmail.com> | 2016-11-27 13:00:29 (GMT) |
---|---|---|
committer | Domen Vrankar <domen.vrankar@gmail.com> | 2016-11-27 22:20:35 (GMT) |
commit | ed8858edb7c5100e1928c5a94f85485f0e322aa7 (patch) | |
tree | c0dee147388fa9dc2c0c57d666d0ada9ee041a85 /Tests/RunCMake/CPack/tests/EMPTY_DIR | |
parent | 8575affa4c72e1c0d07f964d2f28eb6ddbadb291 (diff) | |
download | CMake-ed8858edb7c5100e1928c5a94f85485f0e322aa7.zip CMake-ed8858edb7c5100e1928c5a94f85485f0e322aa7.tar.gz CMake-ed8858edb7c5100e1928c5a94f85485f0e322aa7.tar.bz2 |
Tests: CPack test unify expected file naming
Each generator generates its own file
format with different extensions but
they all create those file names by
a certain pattern and all of them
require the same pieces for that pattern
to work. Now we can only provide pieces
once and and each generator will use those
pieces to generate an expected file name.
Diffstat (limited to 'Tests/RunCMake/CPack/tests/EMPTY_DIR')
-rw-r--r-- | Tests/RunCMake/CPack/tests/EMPTY_DIR/ExpectedFiles.cmake | 4 | ||||
-rw-r--r-- | Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/Tests/RunCMake/CPack/tests/EMPTY_DIR/ExpectedFiles.cmake b/Tests/RunCMake/CPack/tests/EMPTY_DIR/ExpectedFiles.cmake index 5924f1f..bdeae28 100644 --- a/Tests/RunCMake/CPack/tests/EMPTY_DIR/ExpectedFiles.cmake +++ b/Tests/RunCMake/CPack/tests/EMPTY_DIR/ExpectedFiles.cmake @@ -1,14 +1,12 @@ set(whitespaces_ "[\t\n\r ]*") set(EXPECTED_FILES_COUNT "1") +set(EXPECTED_FILES_NAME_GENERATOR_SPECIFIC_FORMAT TRUE) if(GENERATOR_TYPE STREQUAL "DEB") - set(EXPECTED_FILE_1 "empty_dir_0.1.1-1_*.deb") set(EXPECTED_FILE_CONTENT_1 "^.*/usr/${whitespaces_}.*/usr/empty/$") elseif(GENERATOR_TYPE STREQUAL "RPM") - set(EXPECTED_FILE_1 "empty_dir*.rpm") set(EXPECTED_FILE_CONTENT_1 "^/usr/empty$") elseif(GENERATOR_TYPE STREQUAL "TGZ") - set(EXPECTED_FILE_1 "empty_dir*.tar.gz") set(EXPECTED_FILE_CONTENT_1 "^[^\n]*empty_dir-0.1.1-[^\n]*/empty/$") endif() diff --git a/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake b/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake index e435ced..049c4a4 100644 --- a/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake +++ b/Tests/RunCMake/CPack/tests/EMPTY_DIR/test.cmake @@ -1,6 +1,13 @@ if(GENERATOR_TYPE STREQUAL "DEB") set(CPACK_PACKAGE_CONTACT "someone") - set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT") +endif() + +if(GENERATOR_TYPE STREQUAL "DEB" OR GENERATOR_TYPE STREQUAL "RPM") + if(GENERATOR_TYPE STREQUAL "DEB") + set(generator_type_suffix_ "IAN") # not entirely compatible... + endif() + + set(CPACK_${GENERATOR_TYPE}${generator_type_suffix_}_FILE_NAME "${GENERATOR_TYPE}-DEFAULT") endif() install(DIRECTORY DESTINATION empty |