diff options
| author | Raffi Enficiaud <raffi.enficiaud@mines-paris.org> | 2015-09-11 15:31:01 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-09-17 19:30:38 (GMT) |
| commit | 4f2ff6019bbc94fd6a875699dd812f2819131dab (patch) | |
| tree | 9c355e9cac3053fa1a744b6d4ca287fc8e3eb1c7 | |
| parent | 81b748ae1d57dacc9db98e74b23c9215f29b09ac (diff) | |
| download | CMake-4f2ff6019bbc94fd6a875699dd812f2819131dab.zip CMake-4f2ff6019bbc94fd6a875699dd812f2819131dab.tar.gz CMake-4f2ff6019bbc94fd6a875699dd812f2819131dab.tar.bz2 | |
Tests: Make RunCMake.CPack error messages more readable
| -rw-r--r-- | Tests/RunCMake/CPack/DEB/Helpers.cmake | 2 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/README.txt | 4 | ||||
| -rw-r--r-- | Tests/RunCMake/CPack/VerifyResult.cmake | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/Tests/RunCMake/CPack/DEB/Helpers.cmake b/Tests/RunCMake/CPack/DEB/Helpers.cmake index a204a3c..b6f113b 100644 --- a/Tests/RunCMake/CPack/DEB/Helpers.cmake +++ b/Tests/RunCMake/CPack/DEB/Helpers.cmake @@ -14,7 +14,7 @@ function(verifyDebControl FILE PREFIX VERIFY_FILES) ERROR_VARIABLE err_) if(err_) - message(FATAL_ERROR "Debian controll verification failed for file: " + message(FATAL_ERROR "Debian control verification failed for file: " "'${FILE}'; error output: '${err_}'") endif() diff --git a/Tests/RunCMake/CPack/README.txt b/Tests/RunCMake/CPack/README.txt index 365c737..ea68304 100644 --- a/Tests/RunCMake/CPack/README.txt +++ b/Tests/RunCMake/CPack/README.txt @@ -32,14 +32,14 @@ different types of packages. This script is placed into CPack test root directory even if it will be used for only one of the generators. If test will be used for multiple generators but some of them require some -generator speciffic commands then those commands should be added to a separate +generator specific commands then those commands should be added to a separate file that should be located in '<generator_name>/<test_name>-specifics.cmake' in CPack test root directory. CPack execution phase: ---------------------- -Only exececutes CPack for content that was generated during CMake execution +Only executes CPack for content that was generated during CMake execution phase. Verification of generated files: diff --git a/Tests/RunCMake/CPack/VerifyResult.cmake b/Tests/RunCMake/CPack/VerifyResult.cmake index 96efa9e..6eab531 100644 --- a/Tests/RunCMake/CPack/VerifyResult.cmake +++ b/Tests/RunCMake/CPack/VerifyResult.cmake @@ -28,8 +28,9 @@ 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}'" + "Unexpected file content for file No. '${file_no_}'!\n" + " Content: '${PACKAGE_CONTENT}'\n\n" + " Expected: '${EXPECTED_FILE_CONTENT_${file_no_}}'" "${output_error_message}") endif() else() @@ -56,7 +57,7 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0) "${output_error_message}") endif() - # sanity check that we didn't accidentaly list wrong files with our regular + # sanity check that we didn't accidentally list wrong files with our regular # expressions foreach(expected_ IN LISTS allFoundFiles_) list(FIND foundFiles_ "${expected_}" found_) |