lordgamez commented on code in PR #1372:
URL: https://github.com/apache/nifi-minifi-cpp/pull/1372#discussion_r923434339
##########
extensions/sftp/tests/CMakeLists.txt:
##########
@@ -24,41 +24,41 @@ find_package(Maven)
message(STATUS "MAVEN: ${MAVEN_EXECUTABLE}")
if (NOT SKIP_TESTS AND Java_FOUND AND Maven_FOUND AND NOT
DISABLE_EXPRESSION_LANGUAGE)
- file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
- SET(SFTP-EXTENSIONS_TEST_COUNT 0)
- FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
- get_filename_component(testfilename "${testfile}" NAME_WE)
- add_executable("${testfilename}" "${testfile}")
- target_include_directories(${testfilename} BEFORE PRIVATE
${LIBSSH2_INCLUDE_DIR})
- target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
- target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
- target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
- target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/nanofi/include")
- target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/sftp")
- target_include_directories(${testfilename} BEFORE PRIVATE "../")
- target_include_directories(${testfilename} BEFORE PRIVATE
"../client/")
- target_include_directories(${testfilename} BEFORE PRIVATE
"../processors/")
- target_include_directories(${testfilename} BEFORE PRIVATE
./include)
- target_include_directories(${testfilename} BEFORE PRIVATE
./tools)
+ file(GLOB SFTP_INTEGRATION_TESTS "*.cpp")
+ SET(SFTP-EXTENSIONS_TEST_COUNT 0)
+ FOREACH(testfile ${SFTP_INTEGRATION_TESTS})
+ get_filename_component(testfilename "${testfile}" NAME_WE)
+ add_executable("${testfilename}" "${testfile}")
+ target_include_directories(${testfilename} BEFORE PRIVATE
${LIBSSH2_INCLUDE_DIR})
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/standard-processors/processors")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/libminifi/test/")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/nanofi/include")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"${CMAKE_SOURCE_DIR}/extensions/sftp")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../")
+ target_include_directories(${testfilename} BEFORE PRIVATE "../client/")
+ target_include_directories(${testfilename} BEFORE PRIVATE
"../processors/")
+ target_include_directories(${testfilename} BEFORE PRIVATE ./include)
+ target_include_directories(${testfilename} BEFORE PRIVATE ./tools)
- createTests("${testfilename}")
- target_link_libraries(${testfilename} ${CATCH_MAIN_LIB}
core-minifi sftp-test-tools)
- target_link_libraries(${testfilename} minifi-sftp)
- target_link_libraries(${testfilename}
minifi-expression-language-extensions)
- target_link_libraries(${testfilename}
minifi-standard-processors)
- if (NOT DISABLE_ROCKSDB)
- target_link_libraries(${testfilename}
minifi-rocksdb-repos)
- endif()
+ createTests("${testfilename}")
+ target_link_libraries(${testfilename} ${CATCH_MAIN_LIB} core-minifi
sftp-test-tools)
+ target_link_libraries(${testfilename} minifi-sftp)
+ target_link_libraries(${testfilename}
minifi-expression-language-extensions)
+ target_link_libraries(${testfilename} minifi-standard-processors)
+ if (NOT DISABLE_ROCKSDB)
+ target_link_libraries(${testfilename} minifi-rocksdb-repos)
+ endif()
- MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT
"${SFTP-EXTENSIONS_TEST_COUNT}+1")
- add_test(NAME "${testfilename}" COMMAND "${testfilename}"
WORKING_DIRECTORY ${TEST_DIR})
- ENDFOREACH()
- message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP
related test file(s)...")
+ MATH(EXPR SFTP-EXTENSIONS_TEST_COUNT "${SFTP-EXTENSIONS_TEST_COUNT}+1")
+ add_test(NAME "${testfilename}" COMMAND "${testfilename}"
WORKING_DIRECTORY ${TEST_DIR})
+ ENDFOREACH()
+ message("-- Finished building ${SFTP-EXTENSIONS_TEST_COUNT} SFTP related
test file(s)...")
- # Copy test resources
- file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources"
DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
+ # Copy test resources
+ file(COPY "${CMAKE_SOURCE_DIR}/extensions/sftp/tests/resources"
DESTINATION "${CMAKE_BINARY_DIR}/bin/sftp-test/")
- add_subdirectory(tools)
+ add_subdirectory(tools)
else()
- message("Could find Java and Maven to build SFTPTestServer, disabling
SFTP tests")
+ message("Could find Java and Maven to build SFTPTestServer, disabling SFTP
tests")
Review Comment:
Good catch, updated in 8a018d648c9137712e6cff0de9b2c9beb0d9e298
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
