Browse Source

Set Daemon file path properly for crypto tests

Jonas Pflanzer 4 years ago
parent
commit
64bf674a00
2 changed files with 8 additions and 2 deletions
  1. 1 0
      CMakeLists.txt
  2. 7 2
      cli/test/CMakeLists.txt

+ 1 - 0
CMakeLists.txt

@@ -7,6 +7,7 @@ project(ccats)
 
 if(ENABLE_TESTS)
   enable_testing()
+  set(DAEMONFILEPATH ${CMAKE_BINARY_DIR}/files)
 endif()
 
 set(CMAKE_SOURCE_DIR ${CMAKE_SOURCE_DIR}/daemon)

+ 7 - 2
cli/test/CMakeLists.txt

@@ -19,22 +19,27 @@ target_link_libraries(cmdman_test ${CMAKE_THREAD_LIBS_INIT} ${OPENSSL_LIBRARIES}
 add_executable(cryptotest_gcm test/cryptotest_gcm.c)
 target_link_libraries(cryptotest_gcm ${OPENSSL_LIBRARIES})
 
+if(NOT DEFINED DAEMONFILEPATH)
+    set(DAEMONFILEPATH "../../daemon/build/files")
+endif()
+
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/samplekey1.bin ${CMAKE_BINARY_DIR}/test/samplekey1.bin COPYONLY)
 
 add_test(logintest_pos ${SHELL} ${CMAKE_BINARY_DIR}/test/logintest_pos.sh)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/logintest_pos.sh ${CMAKE_BINARY_DIR}/test/logintest_pos.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/logintest_pos.txt ${CMAKE_BINARY_DIR}/test/logintest_pos.txt COPYONLY)
+
 add_test(logintest_neg ${SHELL} ${CMAKE_BINARY_DIR}/test/logintest_neg.sh)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/logintest_neg.sh ${CMAKE_BINARY_DIR}/test/logintest_neg.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/logintest_neg.txt ${CMAKE_BINARY_DIR}/test/logintest_neg.txt COPYONLY)
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/samplefile.txt ${CMAKE_BINARY_DIR}/test/samplefile.txt COPYONLY)
 
-add_test(cryptoput ${SHELL} ${CMAKE_BINARY_DIR}/test/cryptoput.sh)
+add_test(cryptoput ${SHELL} ${CMAKE_BINARY_DIR}/test/cryptoput.sh ${DAEMONFILEPATH})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/cryptoput.sh ${CMAKE_BINARY_DIR}/test/cryptoput.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/cryptoput.txt ${CMAKE_BINARY_DIR}/test/cryptoput.txt COPYONLY)
 
-add_test(cryptoget ${SHELL} ${CMAKE_BINARY_DIR}/test/cryptoget.sh)
+add_test(cryptoget ${SHELL} ${CMAKE_BINARY_DIR}/test/cryptoget.sh ${DAEMONFILEPATH})
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/cryptoget.sh ${CMAKE_BINARY_DIR}/test/cryptoget.sh COPYONLY)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/test/cryptoget.txt ${CMAKE_BINARY_DIR}/test/cryptoget.txt COPYONLY)