Add build target for integration binaries

CMakeLists.txt

@@ -939,16 +939,20 @@ if (HIDAPI_FOUND OR LibUSB_COMPILE_TEST_PASSED)
   endif()
 endif()
 
-option(USE_READLINE "Build with GNU readline support." ON)
-if(USE_READLINE)
-  find_package(Readline)
-  if(READLINE_FOUND AND GNU_READLINE_FOUND)
-    add_definitions(-DHAVE_READLINE)
-    include_directories(${Readline_INCLUDE_DIR})
-    message(STATUS "Found readline library at: ${Readline_ROOT_DIR}")
-    set(EPEE_READLINE epee_readline)
-  else()
-    message(STATUS "Could not find GNU readline library so building without readline support")
+if (BUILD_INTEGRATION)
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D LOKI_ENABLE_INTEGRATION_TEST_HOOKS")
+else()
+  option(USE_READLINE "Build with GNU readline support." ON)
+  if(USE_READLINE)
+    find_package(Readline)
+    if(READLINE_FOUND AND GNU_READLINE_FOUND)
+      add_definitions(-DHAVE_READLINE)
+      include_directories(${Readline_INCLUDE_DIR})
+      message(STATUS "Found readline library at: ${Readline_ROOT_DIR}")
+      set(EPEE_READLINE epee_readline)
+    else()
+      message(STATUS "Could not find GNU readline library so building without readline support")
+    endif()
   endif()
 endif()
 

Makefile

@@ -63,6 +63,10 @@ debug-test:
 	mkdir -p $(builddir)/debug
 	cd $(builddir)/debug && cmake -D BUILD_TESTS=ON -D CMAKE_BUILD_TYPE=Debug $(topdir) &&  $(MAKE) && $(MAKE) ARGS="-E libwallet_api_tests" test
 
+integration:
+	mkdir -p $(builddir)/integration
+	cd $(builddir)/integration && cmake -D CMAKE_BUILD_TYPE=Debug -D BUILD_INTEGRATION=ON $(topdir) &&  $(MAKE)
+
 debug-all:
 	mkdir -p $(builddir)/debug
 	cd $(builddir)/debug && cmake -D BUILD_TESTS=ON -D BUILD_SHARED_LIBS=OFF -D CMAKE_BUILD_TYPE=Debug $(topdir) && $(MAKE)

src/CMakeLists.txt

@@ -119,20 +119,28 @@ if(NOT IOS)
   add_subdirectory(rpc)
   add_subdirectory(serialization)
 endif()
-add_subdirectory(wallet)
+
+if (NOT BUILD_INTEGRATION)
+  add_subdirectory(wallet)
+endif()
+
 if(NOT IOS)
   add_subdirectory(p2p)
 endif()
 add_subdirectory(cryptonote_protocol)
 if(NOT IOS)
   add_subdirectory(simplewallet)
-  add_subdirectory(gen_multisig)
+
+  if(NOT BUILD_INTEGRATION)
+    add_subdirectory(gen_multisig)
+    add_subdirectory(blockchain_utilities)
+  endif()
+
   add_subdirectory(daemonizer)
   add_subdirectory(daemon)
-  add_subdirectory(blockchain_utilities)
 endif()
 
-if(CMAKE_BUILD_TYPE STREQUAL Debug)
+if(CMAKE_BUILD_TYPE STREQUAL Debug AND NOT BUILD_INTEGRATION)
   add_subdirectory(debug_utilities)
 endif()
 

src/common/loki_integration_test_hooks.h

@@ -1,4 +1,3 @@
-#define LOKI_ENABLE_INTEGRATION_TEST_HOOKS
 #if defined(LOKI_ENABLE_INTEGRATION_TEST_HOOKS)
 
 #if defined _WIN32

src/wallet/wallet2.cpp

@@ -287,7 +287,7 @@ std::unique_ptr<tools::wallet2> make_basic(const boost::program_options::variabl
 #if defined(LOKI_ENABLE_INTEGRATION_TEST_HOOKS)
   if (command_line::get_arg(vm, opts.fakenet))
   {
-    assert(!testnet &&!stagnet); // NOTE(loki): Developer error
+    assert(!testnet &&!stagenet); // NOTE(loki): Developer error
     nettype = FAKECHAIN;
   }
 #endif