Update Catch2, prepare include links for change to Catch2 3.0 / system Catch2 installation

tstenner · tstenner · commit 6208017f4897 · 2021-01-27T09:57:52.000+01:00
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
@@ -16,7 +16,7 @@ if(LSL_BENCHMARKS)
 	target_compile_definitions(catch_main PUBLIC CATCH_CONFIG_ENABLE_BENCHMARKING)
 endif()
 target_include_directories(catch_main PUBLIC
-	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty/Catch2>)
+	$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../thirdparty>)
 
 add_executable(lsl_test_exported
 	test_ext_DataType.cpp
diff --git a/testing/bench_ext_bounce.cpp b/testing/bench_ext_bounce.cpp
@@ -1,5 +1,5 @@
-#include "catch.hpp"
 #include "helpers.h"
+#include <catch2/catch.hpp>
 #include <lsl_cpp.h>
 
 TEST_CASE("bounce", "[basic][latency]") {
diff --git a/testing/bench_ext_common.cpp b/testing/bench_ext_common.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <lsl_c.h>
 
 TEST_CASE("common") {
diff --git a/testing/bench_ext_pushpull.cpp b/testing/bench_ext_pushpull.cpp
@@ -1,7 +1,7 @@
-#include "catch.hpp"
 #include "helper_type.hpp"
 #include "helpers.h"
 #include <atomic>
+#include <catch2/catch.hpp>
 #include <list>
 #include <lsl_cpp.h>
 #include <string>
diff --git a/testing/bench_int_sleep.cpp b/testing/bench_int_sleep.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <thread>
 
 TEST_CASE("sleep") {
diff --git a/testing/catch_main.cpp b/testing/catch_main.cpp
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 extern "C" {
 const char *lsl_library_info() { return LSL_VERSION_INFO; }
diff --git a/testing/internal/serialization_v100.cpp b/testing/internal/serialization_v100.cpp
@@ -1,5 +1,5 @@
-#include <catch.hpp>
 #include "sample.h"
+#include <catch2/catch.hpp>
 #include <fstream>
 #include <sstream>
 #include <type_traits>
diff --git a/testing/test_ext_DataType.cpp b/testing/test_ext_DataType.cpp
@@ -1,6 +1,6 @@
-#include "catch.hpp"
 #include "helper_type.hpp"
 #include "helpers.h"
+#include <catch2/catch.hpp>
 #include <cstdint>
 #include <lsl_cpp.h>
 
diff --git a/testing/test_ext_discovery.cpp b/testing/test_ext_discovery.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <lsl_cpp.h>
 #include <thread>
 
diff --git a/testing/test_ext_move.cpp b/testing/test_ext_move.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <lsl_cpp.h>
 #include <thread>
 
diff --git a/testing/test_ext_streaminfo.cpp b/testing/test_ext_streaminfo.cpp
@@ -1,4 +1,4 @@
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <lsl_cpp.h>
 #include <thread>
 
diff --git a/testing/test_ext_time.cpp b/testing/test_ext_time.cpp
@@ -1,6 +1,6 @@
-#include "catch.hpp"
 #include "helpers.h"
 #include <atomic>
+#include <catch2/catch.hpp>
 #include <lsl_cpp.h>
 #include <thread>
 
diff --git a/testing/test_int_inireader.cpp b/testing/test_int_inireader.cpp
@@ -1,5 +1,5 @@
 #include "../src/inireader.h"
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 #include <sstream>
 
 void try_load(INI &pt, const char *contents) {
diff --git a/testing/test_int_network.cpp b/testing/test_int_network.cpp
@@ -1,10 +1,10 @@
 #include "../src/cancellable_streambuf.h"
-#include "catch.hpp"
 #include <boost/asio/io_context.hpp>
 #include <boost/asio/ip/multicast.hpp>
 #include <boost/asio/ip/tcp.hpp>
 #include <boost/asio/ip/udp.hpp>
 #include <boost/asio/ip/v6_only.hpp>
+#include <catch2/catch.hpp>
 #include <chrono>
 #include <condition_variable>
 #include <future>
diff --git a/testing/test_int_samples.cpp b/testing/test_int_samples.cpp
@@ -1,7 +1,7 @@
 #include "../src/consumer_queue.h"
 #include "../src/sample.h"
-#include "catch.hpp"
 #include <atomic>
+#include <catch2/catch.hpp>
 #include <thread>
 
 TEST_CASE("consumer_queue", "[queue][basic]") {
diff --git a/testing/test_int_streaminfo.cpp b/testing/test_int_streaminfo.cpp
@@ -1,6 +1,6 @@
 #include "../src/api_config.h"
 #include "../src/stream_info_impl.h"
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 TEST_CASE("streaminfo matching via XPath", "[basic][streaminfo][xml]") {
 	lsl::stream_info_impl info(
diff --git a/testing/test_int_stringfuncs.cpp b/testing/test_int_stringfuncs.cpp
@@ -1,6 +1,6 @@
 #include "../src/common.h"
 #include "../src/inireader.h"
-#include "catch.hpp"
+#include <catch2/catch.hpp>
 
 using vec = std::vector<std::string>;
 
diff --git a/thirdparty/catch2/catch.hpp b/thirdparty/catch2/catch.hpp
@@ -1,6 +1,6 @@
 /*
- *  Catch v2.13.3
- *  Generated: 2020-10-31 18:20:31.045274
+ *  Catch v2.13.4
+ *  Generated: 2020-12-29 14:48:00.116107
  *  ----------------------------------------------------------
  *  This file has been merged from multiple headers. Please don't edit it directly
  *  Copyright (c) 2020 Two Blue Cubes Ltd. All rights reserved.
@@ -15,7 +15,7 @@
 
 #define CATCH_VERSION_MAJOR 2
 #define CATCH_VERSION_MINOR 13
-#define CATCH_VERSION_PATCH 3
+#define CATCH_VERSION_PATCH 4
 
 #ifdef __clang__
 #    pragma clang system_header
@@ -14126,24 +14126,28 @@ namespace Catch {
 
     namespace {
         struct TestHasher {
-            explicit TestHasher(Catch::SimplePcg32& rng_instance) {
-                basis = rng_instance();
-                basis <<= 32;
-                basis |= rng_instance();
-            }
+            using hash_t = uint64_t;
 
-            uint64_t basis;
+            explicit TestHasher( hash_t hashSuffix ):
+                m_hashSuffix{ hashSuffix } {}
 
-            uint64_t operator()(TestCase const& t) const {
-                // Modified FNV-1a hash
-                static constexpr uint64_t prime = 1099511628211;
-                uint64_t hash = basis;
-                for (const char c : t.name) {
+            uint32_t operator()( TestCase const& t ) const {
+                // FNV-1a hash with multiplication fold.
+                const hash_t prime = 1099511628211u;
+                hash_t hash = 14695981039346656037u;
+                for ( const char c : t.name ) {
                     hash ^= c;
                     hash *= prime;
                 }
-                return hash;
+                hash ^= m_hashSuffix;
+                hash *= prime;
+                const uint32_t low{ static_cast<uint32_t>( hash ) };
+                const uint32_t high{ static_cast<uint32_t>( hash >> 32 ) };
+                return low * high;
             }
+
+        private:
+            hash_t m_hashSuffix;
         };
     } // end unnamed namespace
 
@@ -14161,9 +14165,9 @@ namespace Catch {
 
             case RunTests::InRandomOrder: {
                 seedRng( config );
-                TestHasher h( rng() );
+                TestHasher h{ config.rngSeed() };
 
-                using hashedTest = std::pair<uint64_t, TestCase const*>;
+                using hashedTest = std::pair<TestHasher::hash_t, TestCase const*>;
                 std::vector<hashedTest> indexed_tests;
                 indexed_tests.reserve( unsortedTestCases.size() );
 
@@ -15316,7 +15320,7 @@ namespace Catch {
     }
 
     Version const& libraryVersion() {
-        static Version version( 2, 13, 3, "", 0 );
+        static Version version( 2, 13, 4, "", 0 );
         return version;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "catch.hpp"`
	`1`	`+#include <catch2/catch.hpp>`
`2`	`2`	`#include <lsl_c.h>`
`3`	`3`
`4`	`4`	`TEST_CASE("common") {`