From e6074dfda7f9ff6ac5ffab53a8502af6a25b4636 Mon Sep 17 00:00:00 2001 From: arhag Date: Fri, 27 Apr 2018 09:23:53 -0400 Subject: [PATCH] move wallet_tests back out of unittests --- tests/CMakeLists.txt | 4 ++-- {unittests => tests/tests}/wallet_tests.cpp | 0 unittests/CMakeLists.txt | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) rename {unittests => tests/tests}/wallet_tests.cpp (100%) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 99fb6db4a..ae4cc5582 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -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) # 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 "api_tests/*.cpp") +#file(GLOB UNIT_TESTS "tests/wallet_tests.cpp" "chain_tests/*.cpp" "api_tests/*.cpp" "wasm_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) target_link_libraries( chain_test eosio_testing eosio_chain chainbase eos_utilities chain_plugin wallet_plugin abi_generator fc ${PLATFORM_SPECIFIC_LIBS} ) diff --git a/unittests/wallet_tests.cpp b/tests/tests/wallet_tests.cpp similarity index 100% rename from unittests/wallet_tests.cpp rename to tests/tests/wallet_tests.cpp diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 525efa83c..30ec840f1 100644 --- a/unittests/CMakeLists.txt +++ b/unittests/CMakeLists.txt @@ -16,7 +16,6 @@ include_directories("${CMAKE_BINARY_DIR}/contracts") include_directories("${CMAKE_SOURCE_DIR}/contracts") include_directories("${CMAKE_SOURCE_DIR}/libraries/testing/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") 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_ file(GLOB UNIT_TESTS "*.cpp") 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_CURRENT_SOURCE_DIR}/wasm_tests ) -- GitLab