| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From fa079dfc5e1d22ea35762bf4c5b09999bdc5e731 Mon Sep 17 00:00:00 2001 |
| 2 | From: Jochen Sprickerhof <git@jochen.sprickerhof.de> |
| 3 | Date: Wed, 22 Aug 2018 21:42:09 +0200 |
| 4 | Subject: [PATCH] Don't try to install non existing Encodings/testsuite/data |
| 5 | |
| 6 | Upstream-Status: Backport [https://github.com/pocoproject/poco/pull/2437] |
| 7 | --- |
| 8 | Encodings/testsuite/CMakeLists.txt | 5 +---- |
| 9 | 1 file changed, 1 insertion(+), 4 deletions(-) |
| 10 | |
| 11 | diff --git a/Encodings/testsuite/CMakeLists.txt b/Encodings/testsuite/CMakeLists.txt |
| 12 | index 7508e5522..79495ae02 100644 |
| 13 | --- a/Encodings/testsuite/CMakeLists.txt |
| 14 | +++ b/Encodings/testsuite/CMakeLists.txt |
| 15 | @@ -19,12 +19,9 @@ POCO_SOURCES_AUTO_PLAT( TEST_SRCS WINCE |
| 16 | add_executable( ${TESTUNIT} ${TEST_SRCS} ) |
| 17 | if(ANDROID) |
| 18 | add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} |
| 19 | - COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} "-DTEST_FILES=${CMAKE_CURRENT_SOURCE_DIR}/data;" -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/${TESTUNIT} -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) |
| 20 | + COMMAND ${CMAKE_COMMAND} -DANDROID_NDK=${ANDROID_NDK} -DLIBRARY_DIR=${CMAKE_BINARY_DIR}/lib -DUNITTEST=${CMAKE_BINARY_DIR}/bin/Encodings-testrunner -DTEST_PARAMETER=-all -P ${CMAKE_SOURCE_DIR}/cmake/ExecuteOnAndroid.cmake) |
| 21 | else() |
| 22 | add_test(NAME ${LIBNAME} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${TESTUNIT} -all) |
| 23 | - # The test is run in the build directory. So the test data is copied there too |
| 24 | - add_custom_command(TARGET ${TESTUNIT} POST_BUILD |
| 25 | - COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data ) |
| 26 | endif() |
| 27 | #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) |
| 28 | target_link_libraries( ${TESTUNIT} PocoEncodings PocoFoundation CppUnit ) |
| 29 | -- |
| 30 | 2.18.0 |
| 31 | |