From c37d6ea43b2dfed71c9b20f86bbc3214ff966533 Mon Sep 17 00:00:00 2001 From: Jason Rhinelander Date: Wed, 22 Jun 2022 11:08:07 -0300 Subject: [PATCH] Remove shadow testing framework Bitrotten and apparently doesn't work with libuv event loop. --- CMakeLists.txt | 21 +++++---------------- cmake/shadow.cmake | 21 --------------------- llarp/CMakeLists.txt | 4 ---- llarp/testnet.c | 6 ------ 4 files changed, 5 insertions(+), 47 deletions(-) delete mode 100644 cmake/shadow.cmake delete mode 100644 llarp/testnet.c diff --git a/CMakeLists.txt b/CMakeLists.txt index a5309126a..83f6d3e41 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -51,7 +51,6 @@ option(USE_NETNS "enable networking namespace support. Linux only" OFF) option(NATIVE_BUILD "optimise for host system and FPU" ON) option(EMBEDDED_CFG "optimise for older hardware or embedded systems" OFF) option(BUILD_LIBLOKINET "build liblokinet.so" ON) -option(SHADOW "use shadow testing framework. linux only" OFF) option(XSAN "use sanitiser, if your system has it (requires -DCMAKE_BUILD_TYPE=Debug)" OFF) option(USE_JEMALLOC "Link to jemalloc for memory allocations, if found" ON) option(TESTNET "testnet build" OFF) @@ -178,10 +177,6 @@ if(NOT APPLE) endif() endif() -if (NOT CMAKE_SYSTEM_NAME MATCHES "Linux" AND SHADOW) - message( FATAL_ERROR "shadow-framework is Linux only" ) -endif() - if(XSAN) string(APPEND CMAKE_CXX_FLAGS_DEBUG " -fsanitize=${XSAN} -fno-omit-frame-pointer -fno-sanitize-recover") foreach(type EXE MODULE SHARED STATIC) @@ -229,10 +224,6 @@ if(TESTNET) # add_definitions(-DTESTNET_SPEED=5) endif() -if(SHADOW) - include(cmake/shadow.cmake) -endif() - unset(GIT_VERSION) unset(GIT_VERSION_REAL) @@ -300,13 +291,11 @@ endif() if(WITH_HIVE) add_subdirectory(pybind) endif() -if (NOT SHADOW) - if(WITH_TESTS OR WITH_HIVE) - add_subdirectory(test) - endif() - if(ANDROID) - add_subdirectory(jni) - endif() +if(WITH_TESTS OR WITH_HIVE) + add_subdirectory(test) +endif() +if(ANDROID) + add_subdirectory(jni) endif() add_subdirectory(docs) diff --git a/cmake/shadow.cmake b/cmake/shadow.cmake deleted file mode 100644 index 6eac1a28e..000000000 --- a/cmake/shadow.cmake +++ /dev/null @@ -1,21 +0,0 @@ -set(WITH_STATIC OFF) -set(WITH_SHARED ON) -if("${SHADOW_ROOT}" STREQUAL "") - set(SHADOW_ROOT "$ENV{HOME}/.shadow") -endif("${SHADOW_ROOT}" STREQUAL "") -if(EXISTS "${SHADOW_ROOT}") - message(STATUS "SHADOW_ROOT = ${SHADOW_ROOT}") -else() - message(FATAL_ERROR "SHADOW_ROOT path does not exist: '${SHADOW_ROOT}'") -endif(EXISTS "${SHADOW_ROOT}") - -if(NOT TESTNET) - message(FATAL_ERROR "shadow testing framework requires a testnet build") -endif() - -set(CMAKE_MODULE_PATH "${SHADOW_ROOT}/share/cmake/Modules") -include_directories(${CMAKE_MODULE_PATH}) -include(ShadowTools) -add_compile_options(-fno-inline -fno-strict-aliasing ) -add_definitions(-DLOKINET_SHADOW) -include_directories(${SHADOW_ROOT}/include) diff --git a/llarp/CMakeLists.txt b/llarp/CMakeLists.txt index f91a0dee2..d512e2290 100644 --- a/llarp/CMakeLists.txt +++ b/llarp/CMakeLists.txt @@ -227,10 +227,6 @@ if(TRACY_ROOT) target_sources(liblokinet PRIVATE ${TRACY_ROOT}/TracyClient.cpp) endif() -if(TESTNET) - target_sources(liblokinet PRIVATE testnet.c) -endif() - if(WITH_HIVE) target_sources(liblokinet PRIVATE tooling/router_hive.cpp diff --git a/llarp/testnet.c b/llarp/testnet.c deleted file mode 100644 index 7825445be..000000000 --- a/llarp/testnet.c +++ /dev/null @@ -1,6 +0,0 @@ -#ifdef LOKINET_SHADOW -#include - -/** insert shadow test network specific code here */ - -#endif