From 6c8e5256d644ff317aa3330b5e48d0c9f19aa05b Mon Sep 17 00:00:00 2001
From: Jeff Becker <jeff@i2p.rocks>
Date: Thu, 4 Mar 2021 15:45:52 -0500
Subject: [PATCH] catchAll -> testAll

---
 .drone.jsonnet      |  4 ++--
 test/CMakeLists.txt | 18 +++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.drone.jsonnet b/.drone.jsonnet
index 06bf9e00e..b35b1598d 100644
--- a/.drone.jsonnet
+++ b/.drone.jsonnet
@@ -56,7 +56,7 @@ local debian_pipeline(name, image,
                     '-DWITH_LTO=' + (if lto then 'ON ' else 'OFF ') +
                 cmake_extra,
                 'ninja -v',
-                '../contrib/ci/drone-gdb.sh ./test/catchAll --use-colour yes',
+                '../contrib/ci/drone-gdb.sh ./test/testAll --use-colour yes',
             ] + extra_cmds,
         }
     ],
@@ -199,7 +199,7 @@ local mac_builder(name, build_type='Release', werror=true, cmake_extra='', extra
                 'cmake .. -G Ninja -DCMAKE_CXX_FLAGS=-fcolor-diagnostics -DCMAKE_BUILD_TYPE='+build_type+' ' +
                     (if werror then '-DWARNINGS_AS_ERRORS=ON ' else '') + cmake_extra,
                 'ninja -v',
-                './test/catchAll --use-colour yes',
+                './test/testAll --use-colour yes',
             ] + extra_cmds,
         }
     ]
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 12a392970..1cc2ebbcd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -10,7 +10,7 @@ endif()
 
 add_subdirectory(Catch2)
 
-add_executable(catchAll
+add_executable(testAll
   # helpers
   check_main.cpp
   test_util.cpp
@@ -52,20 +52,16 @@ add_executable(catchAll
   test_llarp_encrypted_frame.cpp
   test_llarp_router_contact.cpp)
 
-target_link_libraries(catchAll PUBLIC liblokinet Catch2::Catch2)
-target_include_directories(catchAll PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
+target_link_libraries(testAll PUBLIC liblokinet Catch2::Catch2)
+target_include_directories(testAll PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
 
 if(WIN32)
-    target_sources(catchAll PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/win32/test.rc")
-    target_link_libraries(catchAll PUBLIC ws2_32 iphlpapi shlwapi)
+    target_sources(testAll PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/win32/test.rc")
+    target_link_libraries(testAll PUBLIC ws2_32 iphlpapi shlwapi)
 endif()
 
 if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
-    target_link_directories(catchAll PRIVATE /usr/local/lib)
+    target_link_directories(testAll PRIVATE /usr/local/lib)
 endif()
 
-# Custom targets to invoke the different test suites:
-add_custom_target(catch COMMAND catchAll)
-
-# Add a custom "check" target that runs all the test suites:
-add_custom_target(check DEPENDS catch)
+add_custom_target(check COMMAND testAll)