Skip to content

Commit 41a8592

Browse files
author
Ivan Zhakov
committed
cmake: Use file(COPY) to copy test data instead of spawning a process.
* CMakeLists.txt (tests): Use a better statement for configure time file manipulation. Submitted by: Timofei Zhakov <rinrab@apache.org> git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@1934148 13f79535-47bb-0310-9956-ffa450edef68
1 parent d311a5e commit 41a8592

1 file changed

Lines changed: 7 additions & 18 deletions

File tree

CMakeLists.txt

Lines changed: 7 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -617,24 +617,13 @@ if(APR_BUILD_TESTAPR)
617617
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
618618

619619
# copy data files to build directory so that we can run programs from there
620-
execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory
621-
${PROJECT_BINARY_DIR}/data)
622-
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
623-
${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
624-
${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
625-
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
626-
${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt
627-
${PROJECT_BINARY_DIR}/data/file_datafile.txt)
628-
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
629-
${PROJECT_SOURCE_DIR}/test/data/mmap_datafile.txt
630-
${PROJECT_BINARY_DIR}/data/mmap_datafile.txt)
631-
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
632-
${PROJECT_SOURCE_DIR}/test/data/mmap_large_datafile.txt
633-
${PROJECT_BINARY_DIR}/data/mmap_large_datafile.txt)
634-
635-
execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
636-
${PROJECT_SOURCE_DIR}/test/echoargs.bat
637-
${PROJECT_BINARY_DIR}/echoargs.bat)
620+
file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/data)
621+
file(COPY ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
622+
${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt
623+
${PROJECT_SOURCE_DIR}/test/data/mmap_datafile.txt
624+
${PROJECT_SOURCE_DIR}/test/data/mmap_large_datafile.txt
625+
${PROJECT_SOURCE_DIR}/test/echoargs.bat
626+
DESTINATION ${PROJECT_BINARY_DIR}/data)
638627

639628
add_executable(testapp test/testapp.c)
640629
target_link_libraries(testapp ${apr_libname} libaprapp-2)

0 commit comments

Comments
 (0)