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

Tests: CPack test should use default package name

Browse Source 
Package names are irrelevant for most
CPack tests so tests now set default
package name that is created from test
name and used if it is not explicitly
provided in the test.
This commit is contained in:
Domen Vrankar
2016-11-26 11:08:05 +01:00
parent 7763bd7207
commit 70b52a7113
28 changed files with 18 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Tests/RunCMake/CPack/CMakeLists.txt
View File

@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
project(${RunCMake_TEST} CXX)
# set default test name (can be overwritten in test.cmake or specifics.cmake)
string(TOLOWER "${RunCMake_TEST_FILE_PREFIX}" CPACK_PACKAGE_NAME)
include(${RunCMake_TEST_FILE_PREFIX}.cmake)
# include test generator specifics

2
Tests/RunCMake/CPack/COMPONENTS_EMPTY_DIR.cmake
View File

@@ -1,5 +1,3 @@
set(CPACK_COMPONENTS_ALL test)
install(DIRECTORY DESTINATION empty
COMPONENT test)
set(CPACK_PACKAGE_NAME "components_empty_dir")

2
Tests/RunCMake/CPack/CUSTOM_NAMES.cmake
View File

@@ -3,5 +3,3 @@ set(CPACK_RPM_COMPONENT_INSTALL "ON")
install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_1)
install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_2)
install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_3)
set(CPACK_PACKAGE_NAME "custom_names")

2
Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-ExpectedFiles.cmake
View File

@@ -1,6 +1,6 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "generate_shlibs_0.1.1-1_*.deb")
set(EXPECTED_FILE_1 "deb_generate_shlibs_0.1.1-1_*.deb")
# dynamic lib extension is .so on Linux and .dylib on Mac so we will use a wildcard .* for it
set(EXPECTED_FILE_CONTENT_1 "^.*/usr/foo${whitespaces_}.*/usr/foo/libtest_lib\\..*$")

2
Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-VerifyResult.cmake
View File

@@ -1,4 +1,4 @@
set(shlibs_shlibs "^libtest_lib 0\\.8 generate_shlibs \\(\\= 0\\.1\\.1\\)\n$")
set(shlibs_shlibs "^libtest_lib 0\\.8 deb_generate_shlibs \\(\\= 0\\.1\\.1\\)\n$")
# optional dot at the end of permissions regex is for SELinux enabled systems
set(shlibs_shlibs_permissions_regex "-rw-r--r--\.? .*")
verifyDebControl("${FOUND_FILE_1}" "shlibs" "shlibs")

2
Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-ExpectedFiles.cmake
View File

@@ -1,6 +1,6 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "generate_shlibs_ldconfig_0.1.1-1_*.deb")
set(EXPECTED_FILE_1 "deb_generate_shlibs_ldconfig_0.1.1-1_*.deb")
# dynamic lib extension is .so on Linux and .dylib on Mac so we will use a wildcard .* for it
set(EXPECTED_FILE_CONTENT_1 "^.*/usr/lib${whitespaces_}.*/usr/lib/libtest_lib\\..*$")

2
Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-VerifyResult.cmake
View File

@@ -1,4 +1,4 @@
set(shlibs_shlibs "^libtest_lib 0\\.8 generate_shlibs_ldconfig \\(>\\= 0\\.1\\.1\\)\n$")
set(shlibs_shlibs "^libtest_lib 0\\.8 deb_generate_shlibs_ldconfig \\(>\\= 0\\.1\\.1\\)\n$")
# NOTE: optional dot at the end of permissions regex is for SELinux enabled systems
set(shlibs_shlibs_permissions_regex "-rw-r--r--\.? .*")
set(shlibs_postinst ".*ldconfig.*")

4
Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-ExpectedFiles.cmake
View File

@@ -1,9 +1,9 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "3")
set(EXPECTED_FILE_1 "per_component-pkg_1_0.1.1-1_*.deb")
set(EXPECTED_FILE_1 "per_component_fields-pkg_1_0.1.1-1_*.deb")
set(EXPECTED_FILE_CONTENT_1 "^.*/usr/foo${whitespaces_}.*/usr/foo/CMakeLists.txt$")
set(EXPECTED_FILE_2 "second_0.1.1-1_*.deb")
set(EXPECTED_FILE_CONTENT_2 "^.*/usr/foo${whitespaces_}.*/usr/foo/CMakeLists.txt$")
set(EXPECTED_FILE_3 "per_component-pkg_3_0.1.1-1_*.deb")
set(EXPECTED_FILE_3 "per_component_fields-pkg_3_0.1.1-1_*.deb")
set(EXPECTED_FILE_CONTENT_3 "^.*/usr/foo${whitespaces_}.*/usr/foo/CMakeLists.txt$")

4
Tests/RunCMake/CPack/DEB/PER_COMPONENT_FIELDS-VerifyResult.cmake
View File

@@ -8,9 +8,9 @@ function(checkPackageInfo_ TYPE FILE REGEX)
endfunction()
# check package name
checkPackageInfo_("name" "${FOUND_FILE_1}" ".*Package${whitespaces_}:${whitespaces_}per_component-pkg_1")
checkPackageInfo_("name" "${FOUND_FILE_1}" ".*Package${whitespaces_}:${whitespaces_}per_component_fields-pkg_1")
checkPackageInfo_("name" "${FOUND_FILE_2}" ".*Package${whitespaces_}:${whitespaces_}second")
checkPackageInfo_("name" "${FOUND_FILE_3}" ".*Package${whitespaces_}:${whitespaces_}per_component-pkg_3")
checkPackageInfo_("name" "${FOUND_FILE_3}" ".*Package${whitespaces_}:${whitespaces_}per_component_fields-pkg_3")
# check package group
checkPackageInfo_("group" "${FOUND_FILE_1}" ".*Section${whitespaces_}:${whitespaces_}default")

2
Tests/RunCMake/CPack/DEBUGINFO.cmake
View File

@@ -30,5 +30,3 @@ set(CPACK_RPM_APPLICATIONS_DEBUGINFO_PACKAGE ON)
set(CPACK_RPM_LIBS_DEBUGINFO_PACKAGE ON)
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/src")
set(CPACK_PACKAGE_NAME "debuginfo")

1
Tests/RunCMake/CPack/DEB_EXTRA.cmake
View File

@@ -32,7 +32,6 @@ endforeach()
set(CPACK_DEBIAN_BAR_PACKAGE_CONTROL_EXTRA
"${CMAKE_CURRENT_BINARY_DIR}/bar/preinst;${CMAKE_CURRENT_BINARY_DIR}/bar/prerm")
set(CPACK_PACKAGE_NAME "deb_extra")
set(CPACK_PACKAGE_CONTACT "someone")
set(CPACK_DEBIAN_FILE_NAME "DEB-DEFAULT")

2
Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS.cmake
View File

@@ -14,5 +14,3 @@ add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
set_target_properties(test_lib PROPERTIES SOVERSION "0.8")
install(TARGETS test_lib DESTINATION foo COMPONENT libs)
set(CPACK_PACKAGE_NAME "generate_shlibs")

2
Tests/RunCMake/CPack/DEB_GENERATE_SHLIBS_LDCONFIG.cmake
View File

@@ -15,5 +15,3 @@ add_library(test_lib SHARED "${CMAKE_CURRENT_BINARY_DIR}/test_lib.cpp")
set_target_properties(test_lib PROPERTIES SOVERSION "0.8")
install(TARGETS test_lib LIBRARY DESTINATION lib COMPONENT libs NAMELINK_SKIP)
set(CPACK_PACKAGE_NAME "generate_shlibs_ldconfig")

2
Tests/RunCMake/CPack/DEPENDENCIES.cmake
View File

@@ -16,5 +16,3 @@ install(TARGETS test_prog DESTINATION foo_auto COMPONENT applications_auto)
install(FILES CMakeLists.txt DESTINATION bar COMPONENT headers)
install(TARGETS test_lib DESTINATION bas COMPONENT libs)
install(TARGETS test_lib DESTINATION bas_auto COMPONENT libs_auto)
set(CPACK_PACKAGE_NAME "dependencies")

2
Tests/RunCMake/CPack/EMPTY_DIR.cmake
View File

@@ -1,4 +1,2 @@
install(DIRECTORY DESTINATION empty
COMPONENT test)
set(CPACK_PACKAGE_NAME "empty_dir")

2
Tests/RunCMake/CPack/INSTALL_SCRIPTS.cmake
View File

@@ -22,5 +22,3 @@ file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/post_uninstall_foo.sh"
install(FILES CMakeLists.txt DESTINATION foo COMPONENT foo)
install(FILES CMakeLists.txt DESTINATION bar COMPONENT bar)
set(CPACK_PACKAGE_NAME "install_scripts")

2
Tests/RunCMake/CPack/LONG_FILENAMES.cmake
View File

@@ -6,5 +6,3 @@ file(WRITE
"long_filename_test")
install(FILES ${LONG_FILENAME} DESTINATION foo)
set(CPACK_PACKAGE_NAME "long_filenames")

2
Tests/RunCMake/CPack/MAIN_COMPONENT.cmake
View File

@@ -10,5 +10,3 @@ else()
set(CPACK_RPM_MAIN_COMPONENT "applications")
set(CPACK_RPM_APPLICATIONS_FILE_NAME "RPM-DEFAULT")
endif()
set(CPACK_PACKAGE_NAME "main_component")

2
Tests/RunCMake/CPack/MINIMAL.cmake
View File

@@ -1,3 +1 @@
install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
set(CPACK_PACKAGE_NAME "minimal")

1
Tests/RunCMake/CPack/PACKAGE_CHECKSUM.cmake
View File

@@ -1,4 +1,3 @@
install(FILES CMakeLists.txt DESTINATION foo)
set(CPACK_PACKAGE_NAME "package_checksum")
set(CPACK_PACKAGE_CHECKSUM ${RunCMake_SUBTEST_SUFFIX})

2
Tests/RunCMake/CPack/PER_COMPONENT_FIELDS.cmake
View File

@@ -1,5 +1,3 @@
install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_1)
install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_2)
install(FILES CMakeLists.txt DESTINATION foo COMPONENT pkg_3)
set(CPACK_PACKAGE_NAME "per_component")

2
Tests/RunCMake/CPack/RPM/PARTIALLY_RELOCATABLE_WARNING-ExpectedFiles.cmake
View File

@@ -1,5 +1,5 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "1")
set(EXPECTED_FILE_1 "PARTIALLY_RELOCATABLE_WARNING-0.1.1-*.rpm")
set(EXPECTED_FILE_1 "partially_relocatable_warning-0.1.1-*.rpm")
set(EXPECTED_FILE_CONTENT_1 "^/not_relocatable${whitespaces_}/not_relocatable/CMakeLists.txt${whitespaces_}/opt$")

6
Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-ExpectedFiles.cmake
View File

@@ -1,9 +1,9 @@
set(whitespaces_ "[\t\n\r ]*")
set(EXPECTED_FILES_COUNT "3")
set(EXPECTED_FILE_1 "per_component*-pkg_1.rpm")
set(EXPECTED_FILE_1 "per_component_fields*-pkg_1.rpm")
set(EXPECTED_FILE_CONTENT_1 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$")
set(EXPECTED_FILE_2 "per_component*-pkg_2.rpm")
set(EXPECTED_FILE_2 "per_component_fields*-pkg_2.rpm")
set(EXPECTED_FILE_CONTENT_2 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$")
set(EXPECTED_FILE_3 "per_component*-pkg_3.rpm")
set(EXPECTED_FILE_3 "per_component_fields*-pkg_3.rpm")
set(EXPECTED_FILE_CONTENT_3 "^/usr/foo${whitespaces_}/usr/foo/CMakeLists.txt$")

4
Tests/RunCMake/CPack/RPM/PER_COMPONENT_FIELDS-VerifyResult.cmake
View File

@@ -8,9 +8,9 @@ function(checkPackageInfo_ TYPE FILE REGEX)
endfunction()
# check package name
checkPackageInfo_("name" "${FOUND_FILE_1}" ".*Name${whitespaces_}:${whitespaces_}per_component-pkg_1")
checkPackageInfo_("name" "${FOUND_FILE_1}" ".*Name${whitespaces_}:${whitespaces_}per_component_fields-pkg_1")
checkPackageInfo_("name" "${FOUND_FILE_2}" ".*Name${whitespaces_}:${whitespaces_}second")
checkPackageInfo_("name" "${FOUND_FILE_3}" ".*Name${whitespaces_}:${whitespaces_}per_component-pkg_3")
checkPackageInfo_("name" "${FOUND_FILE_3}" ".*Name${whitespaces_}:${whitespaces_}per_component_fields-pkg_3")
# check package group
checkPackageInfo_("group" "${FOUND_FILE_1}" ".*Group${whitespaces_}:${whitespaces_}default")

1
Tests/RunCMake/CPack/RPM_DIST.cmake
View File

@@ -1,4 +1,3 @@
install(FILES CMakeLists.txt DESTINATION foo COMPONENT test)
set(CPACK_RPM_PACKAGE_RELEASE_DIST ON)
set(CPACK_PACKAGE_NAME "rpm_dist")

1
Tests/RunCMake/CPack/RPM_SUGGESTS.cmake
View File

@@ -1,4 +1,3 @@
install(FILES CMakeLists.txt DESTINATION foo)
set(CPACK_RPM_PACKAGE_SUGGESTS "libsuggested")
set(CPACK_PACKAGE_NAME "rpm_suggests")

2
Tests/RunCMake/CPack/SINGLE_DEBUGINFO.cmake
View File

@@ -52,5 +52,3 @@ if(RunCMake_SUBTEST_SUFFIX STREQUAL "valid"
endif()
set(CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX "/src")
set(CPACK_PACKAGE_NAME "single_debuginfo")

2
Tests/RunCMake/CPack/SOURCE_PACKAGE.cmake
View File

@@ -5,5 +5,3 @@ add_executable(test_prog "${CMAKE_CURRENT_BINARY_DIR}/main.cpp")
install(TARGETS test_prog DESTINATION foo COMPONENT applications)
set(CPACK_RPM_FILE_NAME "RPM-DEFAULT")
set(CPACK_PACKAGE_NAME "source_package")