56 lines
3.7 KiB
Diff
56 lines
3.7 KiB
Diff
|
From 4552bc886d1bd8966f6ef2f7790835dfdb2e6d8b Mon Sep 17 00:00:00 2001
|
||
|
|
From: Domen Vrankar <domen.vrankar@gmail.com>
|
||
|
|
Date: Sun, 15 Mar 2015 20:37:16 +0100
|
||
|
|
Subject: [PATCH] CPack/RPM relocation paths test fixup
|
||
|
|
|
||
|
|
Patch fixes bug in test reported with
|
||
|
|
id 15442 - older versions of rpm print
|
||
|
|
out package info a bit differently so
|
||
|
|
we should ignore white spaces
|
||
|
|
---
|
||
|
|
Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake | 10 ++++++----
|
||
|
|
1 file changed, 6 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
|
||
|
|
index c7ec709..079b819 100644
|
||
|
|
--- a/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
|
||
|
|
+++ b/Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake
|
||
|
|
@@ -162,28 +162,30 @@ if(CPackGen MATCHES "RPM")
|
||
|
|
ERROR_QUIET
|
||
|
|
OUTPUT_STRIP_TRAILING_WHITESPACE)
|
||
|
|
|
||
|
|
+ set(whitespaces "[\\t\\n\\r ]*")
|
||
|
|
+
|
||
|
|
if(check_file_libraries_match)
|
||
|
|
set(check_file_match_expected_summary ".*${CPACK_RPM_libraries_PACKAGE_SUMMARY}.*")
|
||
|
|
set(check_file_match_expected_description ".*${CPACK_RPM_libraries_PACKAGE_DESCRIPTION}.*")
|
||
|
|
- set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
+ set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}")
|
||
|
|
set(spec_regex "*libraries*")
|
||
|
|
set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/lib.*\n/usr/foo/bar/lib.*/libmylib.a$")
|
||
|
|
elseif(check_file_headers_match)
|
||
|
|
set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
|
||
|
|
set(check_file_match_expected_description ".*${CPACK_COMPONENT_HEADERS_DESCRIPTION}.*")
|
||
|
|
- set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||
|
|
+ set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
|
||
|
|
set(spec_regex "*headers*")
|
||
|
|
set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/include\n/usr/foo/bar/include/mylib.h$")
|
||
|
|
elseif(check_file_applications_match)
|
||
|
|
set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
|
||
|
|
set(check_file_match_expected_description ".*${CPACK_COMPONENT_APPLICATIONS_DESCRIPTION}.*")
|
||
|
|
- set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
|
||
|
|
+ set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}.*")
|
||
|
|
set(spec_regex "*applications*")
|
||
|
|
set(check_content_list "^/usr/foo/bar\n/usr/foo/bar/bin\n/usr/foo/bar/bin/mylibapp$")
|
||
|
|
elseif(check_file_Unspecified_match)
|
||
|
|
set(check_file_match_expected_summary ".*${CPACK_RPM_PACKAGE_SUMMARY}.*")
|
||
|
|
set(check_file_match_expected_description ".*DESCRIPTION.*")
|
||
|
|
- set(check_file_match_expected_relocation_path "Relocations : ${CPACK_PACKAGING_INSTALL_PREFIX} ${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
|
||
|
|
+ set(check_file_match_expected_relocation_path "Relocations${whitespaces}:${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}${whitespaces}${CPACK_PACKAGING_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR}")
|
||
|
|
set(spec_regex "*Unspecified*")
|
||
|
|
set(check_content_list "^/usr/foo/bar
|
||
|
|
/usr/foo/bar/bin
|
||
|
|
--
|
||
|
|
1.7.10.4
|
||
|
|
|