svn commit: r1934148 - apr/apr/trunk

[email protected] Tue, 12 May 2026 18:17:41 -0000
Newsgroups gmane.comp.apache.apr.cvs
Message-ID <177860986142.1996023.3795190652134334625@svn03-he-fi>
Author: ivan
Date: Tue May 12 18:17:41 2026
New Revision: 1934148

Log:
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 <[email protected]>

Modified:
   apr/apr/trunk/CMakeLists.txt

Modified: apr/apr/trunk/CMakeLists.txt
==============================================================================
--- apr/apr/trunk/CMakeLists.txt	Tue May 12 17:09:16 2026	(r1934147)
+++ apr/apr/trunk/CMakeLists.txt	Tue May 12 18:17:41 2026	(r1934148)
@@ -617,24 +617,13 @@ if(APR_BUILD_TESTAPR)
   add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} --verbose)
 
   # copy data files to build directory so that we can run programs from there
-  execute_process(COMMAND ${CMAKE_COMMAND} -E make_directory 
-                  ${PROJECT_BINARY_DIR}/data)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-                  ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
-                  ${PROJECT_BINARY_DIR}/data/billion-laughs.xml)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different 
-                  ${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt
-                  ${PROJECT_BINARY_DIR}/data/file_datafile.txt)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                  ${PROJECT_SOURCE_DIR}/test/data/mmap_datafile.txt
-                  ${PROJECT_BINARY_DIR}/data/mmap_datafile.txt)
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                  ${PROJECT_SOURCE_DIR}/test/data/mmap_large_datafile.txt
-                  ${PROJECT_BINARY_DIR}/data/mmap_large_datafile.txt)
-
-  execute_process(COMMAND ${CMAKE_COMMAND} -E copy_if_different
-                  ${PROJECT_SOURCE_DIR}/test/echoargs.bat
-                  ${PROJECT_BINARY_DIR}/echoargs.bat)
+  file(MAKE_DIRECTORY ${PROJECT_BINARY_DIR}/data)
+  file(COPY ${PROJECT_SOURCE_DIR}/test/data/billion-laughs.xml
+            ${PROJECT_SOURCE_DIR}/test/data/file_datafile.txt
+            ${PROJECT_SOURCE_DIR}/test/data/mmap_datafile.txt
+            ${PROJECT_SOURCE_DIR}/test/data/mmap_large_datafile.txt
+            ${PROJECT_SOURCE_DIR}/test/echoargs.bat
+       DESTINATION ${PROJECT_BINARY_DIR}/data)
 
   add_executable(testapp test/testapp.c)
   target_link_libraries(testapp ${apr_libname} libaprapp-2)