This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via b661d4a77011f4407b4770a7ee166b557b61893e (commit) via 4a104822359a60795f237f848ec00c736638eac9 (commit) via 5c6ffd2d6dcc1954966638ee0044f4481fb47cb6 (commit) via d6378091361623a9018925b9cfb2708f6a0183f4 (commit) from 828c035c635523af3348082650c2a47d53619239 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b661d4a77011f4407b4770a7ee166b557b61893e commit b661d4a77011f4407b4770a7ee166b557b61893e Merge: 828c035 4a10482 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Sun Jun 19 16:36:55 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Jun 19 16:36:55 2016 -0400 Merge topic 'cpack-deb-test-fixes' into next 4a104822 CPack/Deb test regex variable name was invalid and did not test preinst script 5c6ffd2d CPack/Deb fix tests for SELinux-enabled systems d6378091 CMake Nightly Date Stamp https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4a104822359a60795f237f848ec00c736638eac9 commit 4a104822359a60795f237f848ec00c736638eac9 Author: Patrick mail6543210 <mail6543...@yahoo.com.tw> AuthorDate: Sun Jun 19 22:28:19 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sun Jun 19 22:36:05 2016 +0200 CPack/Deb test regex variable name was invalid and did not test preinst script diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake index 5b6ae73..85e137f 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake +++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake @@ -6,13 +6,13 @@ set(foo_prerm_permissions_regex "-rwxr-xr-x\.? .*") verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm") set(bar_preinst "^echo bar_preinst$") -set(bar_prerm_permissions_regex "-rwx------\.? .*") +set(bar_preinst_permissions_regex "-rwx------\.? .*") set(bar_prerm "^echo bar_prerm$") set(bar_prerm_permissions_regex "-rwx------\.? .*") verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm") set(bas_preinst "^echo default_preinst$") -set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*") +set(bas_preinst_permissions_regex "-rwxr-xr-x\.? .*") set(bas_prerm "^echo default_prerm$") set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*") verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm") https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5c6ffd2d6dcc1954966638ee0044f4481fb47cb6 commit 5c6ffd2d6dcc1954966638ee0044f4481fb47cb6 Author: Patrick mail6543210 <mail6543...@yahoo.com.tw> AuthorDate: Sun Jun 19 22:19:56 2016 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Sun Jun 19 22:35:42 2016 +0200 CPack/Deb fix tests for SELinux-enabled systems diff --git a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake index 5f929ff..5b6ae73 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake +++ b/Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake @@ -1,17 +1,18 @@ set(foo_preinst "^echo default_preinst$") -set(foo_preinst_permissions_regex "-rwxr-xr-x .*") +# NOTE: optional dot at the end of permissions regex is for SELinux enabled systems +set(foo_preinst_permissions_regex "-rwxr-xr-x\.? .*") set(foo_prerm "^echo default_prerm$") -set(foo_prerm_permissions_regex "-rwxr-xr-x .*") +set(foo_prerm_permissions_regex "-rwxr-xr-x\.? .*") verifyDebControl("${FOUND_FILE_1}" "foo" "preinst;prerm") set(bar_preinst "^echo bar_preinst$") -set(bar_prerm_permissions_regex "-rwx------ .*") +set(bar_prerm_permissions_regex "-rwx------\.? .*") set(bar_prerm "^echo bar_prerm$") -set(bar_prerm_permissions_regex "-rwx------ .*") +set(bar_prerm_permissions_regex "-rwx------\.? .*") verifyDebControl("${FOUND_FILE_2}" "bar" "preinst;prerm") set(bas_preinst "^echo default_preinst$") -set(bas_prerm_permissions_regex "-rwxr-xr-x .*") +set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*") set(bas_prerm "^echo default_prerm$") -set(bas_prerm_permissions_regex "-rwxr-xr-x .*") +set(bas_prerm_permissions_regex "-rwxr-xr-x\.? .*") verifyDebControl("${FOUND_FILE_3}" "bas" "preinst;prerm") diff --git a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-VerifyResult.cmake index 8ccb628..b1952ef 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-VerifyResult.cmake +++ b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS-VerifyResult.cmake @@ -1,3 +1,4 @@ set(shlibs_shlibs "^libtest_lib 0\\.8 generate_shlibs \\(\\= 0\\.1\\.1\\)\n$") -set(shlibs_shlibs_permissions_regex "-rw-r--r-- .*") +# 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") diff --git a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-VerifyResult.cmake b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-VerifyResult.cmake index d04c641..422cfbe 100644 --- a/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-VerifyResult.cmake +++ b/Tests/RunCMake/CPack/DEB/DEB_GENERATE_SHLIBS_LDCONFIG-VerifyResult.cmake @@ -1,7 +1,8 @@ set(shlibs_shlibs "^libtest_lib 0\\.8 generate_shlibs_ldconfig \\(>\\= 0\\.1\\.1\\)\n$") -set(shlibs_shlibs_permissions_regex "-rw-r--r-- .*") +# 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.*") -set(shlibs_postinst_permissions_regex "-rwxr-xr-x .*") +set(shlibs_postinst_permissions_regex "-rwxr-xr-x\.? .*") set(shlibs_postrm ".*ldconfig.*") -set(shlibs_postrm_permissions_regex "-rwxr-xr-x .*") +set(shlibs_postrm_permissions_regex "-rwxr-xr-x\.? .*") verifyDebControl("${FOUND_FILE_1}" "shlibs" "shlibs;postinst;postrm") ----------------------------------------------------------------------- Summary of changes: Source/CMakeVersion.cmake | 2 +- Tests/RunCMake/CPack/DEB/DEB_EXTRA-VerifyResult.cmake | 13 +++++++------ .../CPack/DEB/DEB_GENERATE_SHLIBS-VerifyResult.cmake | 3 ++- .../DEB/DEB_GENERATE_SHLIBS_LDCONFIG-VerifyResult.cmake | 7 ++++--- 4 files changed, 14 insertions(+), 11 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits