提交 e6074dfd 编写于 作者: A arhag

move wallet_tests back out of unittests

上级 b5b57242
...@@ -19,8 +19,8 @@ include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include") ...@@ -19,8 +19,8 @@ include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/config.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/config.hpp ESCAPE_QUOTES) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/tests/config.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/tests/config.hpp ESCAPE_QUOTES)
# Temporarily remove some tests to get chain_test to compile # Temporarily remove some tests to get chain_test to compile
#file(GLOB UNIT_TESTS "chain_tests/*.cpp" "api_tests/*.cpp" "wasm_tests/*.cpp") #file(GLOB UNIT_TESTS "tests/wallet_tests.cpp" "chain_tests/*.cpp" "api_tests/*.cpp" "wasm_tests/*.cpp")
file(GLOB UNIT_TESTS "api_tests/*.cpp") file(GLOB UNIT_TESTS "tests/wallet_tests.cpp" "api_tests/*.cpp")
add_executable( chain_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} common/main.cpp) add_executable( chain_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} common/main.cpp)
target_link_libraries( chain_test eosio_testing eosio_chain chainbase eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} ) target_link_libraries( chain_test eosio_testing eosio_chain chainbase eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
......
...@@ -16,7 +16,6 @@ include_directories("${CMAKE_BINARY_DIR}/contracts") ...@@ -16,7 +16,6 @@ include_directories("${CMAKE_BINARY_DIR}/contracts")
include_directories("${CMAKE_SOURCE_DIR}/contracts") include_directories("${CMAKE_SOURCE_DIR}/contracts")
include_directories("${CMAKE_SOURCE_DIR}/libraries/testing/include") include_directories("${CMAKE_SOURCE_DIR}/libraries/testing/include")
include_directories("${CMAKE_SOURCE_DIR}/plugins/chain_plugin/include") include_directories("${CMAKE_SOURCE_DIR}/plugins/chain_plugin/include")
include_directories("${CMAKE_SOURCE_DIR}/plugins/wallet_plugin/include")
include_directories("${CMAKE_SOURCE_DIR}/libraries/appbase/include") include_directories("${CMAKE_SOURCE_DIR}/libraries/appbase/include")
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/config.hpp ESCAPE_QUOTES) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in ${CMAKE_CURRENT_SOURCE_DIR}/config.hpp ESCAPE_QUOTES)
...@@ -24,7 +23,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in ${CMAKE_CURRENT_SOURCE_ ...@@ -24,7 +23,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.hpp.in ${CMAKE_CURRENT_SOURCE_
file(GLOB UNIT_TESTS "*.cpp") file(GLOB UNIT_TESTS "*.cpp")
add_executable( unit_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} ) add_executable( unit_test ${UNIT_TESTS} ${WASM_UNIT_TESTS} )
target_link_libraries( unit_test eosio_chain chainbase eosio_testing eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} ) target_link_libraries( unit_test eosio_chain chainbase eosio_testing eos_utilities chain_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} )
target_include_directories( unit_test PUBLIC ${CMAKE_BINARY_DIR}/contracts ${CMAKE_CURRENT_BINARY_DIR}/tests/contracts ) target_include_directories( unit_test PUBLIC ${CMAKE_BINARY_DIR}/contracts ${CMAKE_CURRENT_BINARY_DIR}/tests/contracts )
target_include_directories( unit_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/wasm_tests ) target_include_directories( unit_test PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/wasm_tests )
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册