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 3acb236e86a081e522417b0881f87d08f904ee3d (commit) via 05358225bec5e483fbc5c39e7b2221c2927aabe5 (commit) from 91dd5ba7234299e15ea2db9be988c4a9409f1d4b (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=3acb236e86a081e522417b0881f87d08f904ee3d commit 3acb236e86a081e522417b0881f87d08f904ee3d Merge: 91dd5ba 0535822 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Jun 10 11:10:39 2015 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Wed Jun 10 11:10:39 2015 -0400 Merge topic 'cpack-rpm-and-deb-runcmake-tests' into next 05358225 fixup! CPack Deb and RPM RunCMake tests http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=05358225bec5e483fbc5c39e7b2221c2927aabe5 commit 05358225bec5e483fbc5c39e7b2221c2927aabe5 Author: Domen Vrankar <domen.vran...@gmail.com> AuthorDate: Wed Jun 10 17:09:23 2015 +0200 Commit: Domen Vrankar <domen.vran...@gmail.com> CommitDate: Wed Jun 10 17:09:23 2015 +0200 fixup! CPack Deb and RPM RunCMake tests Added some extra logging and newer cmake version enforcing to determine what is causing RPM tests to fail on some systems. diff --git a/Tests/RunCMake/CPack/RunCMakeTest.cmake b/Tests/RunCMake/CPack/RunCMakeTest.cmake index 4ae8992..308b8cc 100644 --- a/Tests/RunCMake/CPack/RunCMakeTest.cmake +++ b/Tests/RunCMake/CPack/RunCMakeTest.cmake @@ -1,4 +1,4 @@ -cmake_policy(SET CMP0011 NEW) +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) include(RunCMake) include("${RunCMake_SOURCE_DIR}/CPackTestHelpers.cmake") diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index 0cc32d4..c89bfae 100644 --- a/Tests/RunCMake/CPack/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/VerifyResult.cmake @@ -1,8 +1,13 @@ -cmake_policy(SET CMP0007 NEW) +cmake_minimum_required(VERSION 3.1 FATAL_ERROR) include("${config_file}") include("${src_dir}/${GENERATOR_TYPE}/Helpers.cmake") +file(READ "${bin_dir}/test_output.txt" output) +file(READ "${bin_dir}/test_error.txt" error) + +set(output_error_message "\nCPack output: '${output}'\nCPack error: '${error}'") + # check that expected generated files exist and contain expected content include("${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-ExpectedFiles.cmake") @@ -22,13 +27,15 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0) if(NOT expected_content_list) message(FATAL_ERROR "Unexpected file content for file No. '${file_no_}'!" - " Content: '${PACKAGE_CONTENT}'") + " Content: '${PACKAGE_CONTENT}'" + "${output_error_message}") endif() else() message(FATAL_ERROR "Found more than one file for file No. '${file_no_}'!" " Found files count '${foundFilesCount_}'." - " Files: '${foundFile_}'") + " Files: '${foundFile_}'" + "${output_error_message}") endif() endforeach() @@ -43,7 +50,8 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0) if(NOT foundFilesCount_ EQUAL allFoundFilesCount_) message(FATAL_ERROR - "Found more files than expected! Found files: '${allFoundFiles_}'") + "Found more files than expected! Found files: '${allFoundFiles_}'" + "${output_error_message}") endif() # sanity check that we didn't accidentaly list wrong files with our regular @@ -54,7 +62,8 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0) if(found_ EQUAL -1) message(FATAL_ERROR "Expected files don't match found files! Found files:" - " '${allFoundFiles_}'") + " '${allFoundFiles_}'" + "${output_error_message}") endif() endforeach() else() @@ -63,14 +72,12 @@ else() file(GLOB checkMissingFiles_ RELATIVE "${bin_dir}" "${missing_file_glob_}") if(checkMissingFiles_) - message(FATAL_ERROR "Unexpected files found: '${checkMissingFiles_}'") + message(FATAL_ERROR "Unexpected files found: '${checkMissingFiles_}'" + "${output_error_message}") endif() endforeach() endif() -file(READ "${bin_dir}/test_output.txt" output) -file(READ "${bin_dir}/test_error.txt" error) - # handle additional result verifications if(EXISTS "${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-VerifyResult.cmake") include("${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-VerifyResult.cmake") ----------------------------------------------------------------------- Summary of changes: Tests/RunCMake/CPack/RunCMakeTest.cmake | 2 +- Tests/RunCMake/CPack/VerifyResult.cmake | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits