464567a577
Teach cmFileCopier::InstallDirectory to detect whether the destination directory exists. If so, report it as "Up-to-date" instead of "Installing". This resolves message asymmetry with file installations. Extend the RunCMake.file and RunCMake.install tests to check the installation output on both the first and second run. Suggested-by: J Decker <d3ck0r@gmail.com>
29 lines
1.1 KiB
CMake
29 lines
1.1 KiB
CMake
file(REMOVE_RECURSE ${RunCMake_TEST_BINARY_DIR}/prefix)
|
|
execute_process(COMMAND ${CMAKE_COMMAND} -P ${RunCMake_TEST_BINARY_DIR}/cmake_install.cmake
|
|
OUTPUT_VARIABLE out ERROR_VARIABLE err)
|
|
set(expect "
|
|
-- Installing: [^\n]*/prefix/dir\r?
|
|
-- Installing: [^\n]*/prefix/dir/empty.txt\r?
|
|
")
|
|
if(NOT out MATCHES "${expect}")
|
|
string(REGEX REPLACE "\n" "\n " out " ${out}")
|
|
set(RunCMake_TEST_FAILED
|
|
"${RunCMake_TEST_FAILED}First install did not say 'Installing' as expected:\n${out}")
|
|
endif()
|
|
set(f ${RunCMake_TEST_BINARY_DIR}/prefix/dir/empty.txt)
|
|
if(NOT EXISTS "${f}")
|
|
set(RunCMake_TEST_FAILED
|
|
"${RunCMake_TEST_FAILED}File was not installed:\n ${f}\n")
|
|
endif()
|
|
execute_process(COMMAND ${CMAKE_COMMAND} -P ${RunCMake_TEST_BINARY_DIR}/cmake_install.cmake
|
|
OUTPUT_VARIABLE out ERROR_VARIABLE err)
|
|
set(expect "
|
|
-- Up-to-date: [^\n]*/prefix/dir\r?
|
|
-- Up-to-date: [^\n]*/prefix/dir/empty.txt\r?
|
|
")
|
|
if(NOT out MATCHES "${expect}")
|
|
string(REGEX REPLACE "\n" "\n " out " ${out}")
|
|
set(RunCMake_TEST_FAILED
|
|
"${RunCMake_TEST_FAILED}Second install did not say 'Up-to-date' as expected:\n${out}")
|
|
endif()
|