[Cmake-commits] CMake branch, next, updated. v3.2.2-2057-g819b17e
Domen Vrankar
domen.vrankar at gmail.com
Wed Apr 22 15:10:32 EDT 2015
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 819b17ec45295da21f082efcaf311d7300f8f1e6 (commit)
via a2d36e37bf3f7a9f8f05c60ac174a1e885d996f4 (commit)
from 26af9079f9c8e5a323157963077f9928c89b95ff (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=819b17ec45295da21f082efcaf311d7300f8f1e6
commit 819b17ec45295da21f082efcaf311d7300f8f1e6
Merge: 26af907 a2d36e3
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Apr 22 15:10:31 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 22 15:10:31 2015 -0400
Merge topic 'cpack-deb-linitian-md5hash' into next
a2d36e37 fixup! CPackDEB basic package tests
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2d36e37bf3f7a9f8f05c60ac174a1e885d996f4
commit a2d36e37bf3f7a9f8f05c60ac174a1e885d996f4
Author: Domen Vrankar <domen.vrankar at gmail.com>
AuthorDate: Wed Apr 22 21:03:47 2015 +0200
Commit: Domen Vrankar <domen.vrankar at gmail.com>
CommitDate: Wed Apr 22 21:03:47 2015 +0200
fixup! CPackDEB basic package tests
Skipt test when lintian and/or dpkg-deb
executables are not found.
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-lintian-dpkgdeb-checks.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-lintian-dpkgdeb-checks.cmake
index d1c35bb..5460b1a 100644
--- a/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-lintian-dpkgdeb-checks.cmake
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult-components-lintian-dpkgdeb-checks.cmake
@@ -17,54 +17,62 @@ run_cpack(actual_output
CONFIG_ARGS "${config_args}"
CONFIG_VERBOSE "${config_verbose}")
-message(STATUS "expected_count='${expected_count}'")
-message(STATUS "expected_file_mask='${expected_file_mask}'")
-message(STATUS "actual_output_files='${actual_output}'")
-
if(NOT actual_output)
+ message(STATUS "expected_count='${expected_count}'")
+ message(STATUS "expected_file_mask='${expected_file_mask}'")
+ message(STATUS "actual_output_files='${actual_output}'")
message(FATAL_ERROR "error: expected_files do not exist: CPackComponentsDEB test fails. (CPack_output=${CPack_output}, CPack_error=${CPack_error}")
endif()
list(LENGTH actual_output actual_count)
-message(STATUS "actual_count='${actual_count}'")
if(NOT actual_count EQUAL expected_count)
+ message(STATUS "actual_count='${actual_count}'")
message(FATAL_ERROR "error: expected_count=${expected_count} does not match actual_count=${actual_count}: CPackComponents test fails. (CPack_output=${CPack_output}, CPack_error=${CPack_error})")
endif()
# lintian checks
-set(lintian_output_errors_all "")
-foreach(_f IN LISTS actual_output)
- set(STRINGS_TO_AVOID "E:([^\r\n]*)control-file-has-bad-permissions")
- lintian_check_specific_errors(lintian_output_errors
- FILENAME "${_f}"
- ERROR_REGEX_STRINGS "${STRINGS_TO_AVOID}")
-
- set(lintian_output_errors_all "${lintian_output_errors_all}${lintian_output_errors}")
-endforeach()
-if(NOT "${lintian_output_errors_all}" STREQUAL "")
- message(FATAL_ERROR "Lintian checks failed:\n${lintian_output_errors_all}")
+find_program(LINTIAN_EXECUTABLE lintian)
+if(LINTIAN_EXECUTABLE)
+ set(lintian_output_errors_all "")
+ foreach(_f IN LISTS actual_output)
+ set(STRINGS_TO_AVOID "E:([^\r\n]*)control-file-has-bad-permissions")
+ lintian_check_specific_errors(lintian_output_errors
+ FILENAME "${_f}"
+ ERROR_REGEX_STRINGS "${STRINGS_TO_AVOID}")
+
+ set(lintian_output_errors_all "${lintian_output_errors_all}${lintian_output_errors}")
+ endforeach()
+
+ if(NOT "${lintian_output_errors_all}" STREQUAL "")
+ message(FATAL_ERROR "Lintian checks failed:\n${lintian_output_errors_all}")
+ endif()
+else()
+ message("lintian executable not found - skipping lintian test")
endif()
-
# dpkg-deb checks
-set(dpkgdeb_output_errors_all "")
-foreach(_f IN LISTS actual_output)
- run_dpkgdeb(dpkg_output
- FILENAME "${_f}"
- )
-
- dpkgdeb_return_specific_metaentry(dpkgentry
- DPKGDEB_OUTPUT "${dpkg_output}"
- METAENTRY "Maintainer:")
-
- if(NOT "${dpkgentry}" STREQUAL "None")
- set(dpkgdeb_output_errors_all "${dpkgdeb_output_errors_all}"
- "dpkg-deb: ${_f}: Incorrect value for Maintainer: ${dpkgentry} != None\n")
+find_program(DPKGDEB_EXECUTABLE dpkg-deb)
+if(DPKGDEB_EXECUTABLE)
+ set(dpkgdeb_output_errors_all "")
+ foreach(_f IN LISTS actual_output)
+ run_dpkgdeb(dpkg_output
+ FILENAME "${_f}"
+ )
+
+ dpkgdeb_return_specific_metaentry(dpkgentry
+ DPKGDEB_OUTPUT "${dpkg_output}"
+ METAENTRY "Maintainer:")
+
+ if(NOT "${dpkgentry}" STREQUAL "None")
+ set(dpkgdeb_output_errors_all "${dpkgdeb_output_errors_all}"
+ "dpkg-deb: ${_f}: Incorrect value for Maintainer: ${dpkgentry} != None\n")
+ endif()
+ endforeach()
+
+ if(NOT "${dpkgdeb_output_errors_all}" STREQUAL "")
+ message(FATAL_ERROR "dpkg-deb checks failed:\n${dpkgdeb_output_errors_all}")
endif()
-endforeach()
-
-
-if(NOT "${dpkgdeb_output_errors_all}" STREQUAL "")
- message(FATAL_ERROR "dpkg-deb checks failed:\n${dpkgdeb_output_errors_all}")
+else()
+ message("dpkg-deb executable not found - skipping dpkg-deb test")
endif()
diff --git a/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake b/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake
index 798512f..bd4f12a 100644
--- a/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake
+++ b/Tests/CPackComponentsDEB/RunCPackVerifyResult.cmake
@@ -75,7 +75,6 @@ function(run_lintian lintian_output)
find_program(LINTIAN_EXECUTABLE lintian)
if(LINTIAN_EXECUTABLE)
-
set(options "")
set(oneValueArgs "FILENAME")
set(multiValueArgs "")
@@ -95,6 +94,8 @@ function(run_lintian lintian_output)
OUTPUT_STRIP_TRAILING_WHITESPACE )
set(${lintian_output} "${LINTIAN_OUTPUT}" PARENT_SCOPE)
+ else()
+ message(FATAL_ERROR "run_lintian called without lintian executable being present")
endif()
endfunction()
@@ -112,7 +113,7 @@ function(lintian_check_specific_errors output_errors)
set(lintian_output)
run_lintian(lintian_output FILENAME ${lintian_check_specific_errors_deb_FILENAME})
- message(STATUS "Lintian output is ${lintian_output}")
+ message(STATUS "Lintian output is ''${lintian_output}'")
# regex to avoid
foreach(_s IN LISTS lintian_check_specific_errors_deb_ERROR_REGEX_STRINGS)
@@ -160,6 +161,8 @@ function(run_dpkgdeb dpkg_deb_output)
OUTPUT_STRIP_TRAILING_WHITESPACE )
set(${dpkg_deb_output} "${DPKGDEB_OUTPUT}" PARENT_SCOPE)
+ else()
+ message(FATAL_ERROR "run_dpkgdeb called without dpkg-deb executable being present")
endif()
endfunction()
-----------------------------------------------------------------------
Summary of changes:
...yResult-components-lintian-dpkgdeb-checks.cmake | 78 +++++++++++---------
.../CPackComponentsDEB/RunCPackVerifyResult.cmake | 7 +-
2 files changed, 48 insertions(+), 37 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list