kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tests/RunCMake/CPack: found files should be preserved 

Package file names that are found during validation
should be preserved in FOUND_FILE_${NO} variables
that can be later used in custom VerifyResult scripts.
This commit is contained in:
Domen Vrankar 2015-07-13 22:21:34 +02:00 committed by Brad King
parent 179aa0bb0a
commit 47d1f1189c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Tests/RunCMake/CPack/VerifyResult.cmake
View File

@ -15,13 +15,13 @@ include("${src_dir}/${GENERATOR_TYPE}/${RunCMake_TEST}-ExpectedFiles.cmake")
if(NOT EXPECTED_FILES_COUNT EQUAL 0) if(NOT EXPECTED_FILES_COUNT EQUAL 0)
foreach(file_no_ RANGE 1 ${EXPECTED_FILES_COUNT}) foreach(file_no_ RANGE 1 ${EXPECTED_FILES_COUNT})
file(GLOB foundFile_ RELATIVE "${bin_dir}" "${EXPECTED_FILE_${file_no_}}") file(GLOB FOUND_FILE_${file_no_} RELATIVE "${bin_dir}" "${EXPECTED_FILE_${file_no_}}")
set(foundFiles_ "${foundFiles_};${foundFile_}") set(foundFiles_ "${foundFiles_};${FOUND_FILE_${file_no_}}")
list(LENGTH foundFile_ foundFilesCount_) list(LENGTH FOUND_FILE_${file_no_} foundFilesCount_)
if(foundFilesCount_ EQUAL 1) if(foundFilesCount_ EQUAL 1)
unset(PACKAGE_CONTENT) unset(PACKAGE_CONTENT)
getPackageContent("${bin_dir}/${foundFile_}" "PACKAGE_CONTENT") getPackageContent("${bin_dir}/${FOUND_FILE_${file_no_}}" "PACKAGE_CONTENT")
string(REGEX MATCH "${EXPECTED_FILE_CONTENT_${file_no_}}" string(REGEX MATCH "${EXPECTED_FILE_CONTENT_${file_no_}}"
expected_content_list "${PACKAGE_CONTENT}") expected_content_list "${PACKAGE_CONTENT}")
@ -36,7 +36,7 @@ if(NOT EXPECTED_FILES_COUNT EQUAL 0)
message(FATAL_ERROR message(FATAL_ERROR
"Found more than one file for file No. '${file_no_}'!" "Found more than one file for file No. '${file_no_}'!"
" Found files count '${foundFilesCount_}'." " Found files count '${foundFilesCount_}'."
" Files: '${foundFile_}'" " Files: '${FOUND_FILE_${file_no_}}'"
"${output_error_message}") "${output_error_message}")
endif() endif()
endforeach() endforeach()