add tdb_catch.h wrapper for catch.hpp (#3390)

* add tdb_catch.h wrapper to aid transition to new/mixed catch2/3 versions in build environments * locate tdb_catch.h in test/support (a new [sub-]directory)
TileDB-Inc · Aug 2, 2022 · d48f874 · d48f874
1 parent c51ebe9
commit d48f874
Show file tree

Hide file tree

Showing 190 changed files with 255 additions and 209 deletions.
diff --git a/experimental/tiledb/common/dag/execution/test/main.cc b/experimental/tiledb/common/dag/execution/test/main.cc
@@ -31,4 +31,4 @@
  */
 
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
diff --git a/experimental/tiledb/common/dag/execution/test/unit_threadpool.cc b/experimental/tiledb/common/dag/execution/test/unit_threadpool.cc
@@ -30,7 +30,7 @@
  * Tests the threadpool class.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "experimental/tiledb/common/dag/execution/threadpool.h"
 
 // using namespace tiledb::common;

diff --git a/experimental/tiledb/common/dag/ports/test/unit_fsm.h b/experimental/tiledb/common/dag/ports/test/unit_fsm.h
@@ -30,5 +30,5 @@
 
 #ifndef TILEDB_UNIT_FSM_H
 #define TILEDB_UNIT_FSM_H
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #endif  // TILEDB_UNIT_FSM_H
diff --git a/experimental/tiledb/common/dag/ports/test/unit_ports.h b/experimental/tiledb/common/dag/ports/test/unit_ports.h
@@ -30,5 +30,5 @@
 
 #ifndef TILEDB_UNIT_PORTS_H
 #define TILEDB_UNIT_PORTS_H
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #endif  // TILEDB_UNIT_PORTS_H
diff --git a/experimental/tiledb/common/dag/utils/test/main.cc b/experimental/tiledb/common/dag/utils/test/main.cc
@@ -31,4 +31,4 @@
  */
 
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
diff --git a/experimental/tiledb/common/dag/utils/test/unit_range_join.cc b/experimental/tiledb/common/dag/utils/test/unit_range_join.cc
@@ -35,7 +35,7 @@
 #include <vector>
 #include "external/include/span/span.hpp"
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "experimental/tiledb/common/dag/utils/range_join.h"
 
 using namespace tiledb::common;

diff --git a/experimental/tiledb/common/dag/utils/test/unit_spinlock.cc b/experimental/tiledb/common/dag/utils/test/unit_spinlock.cc
@@ -30,7 +30,7 @@
  * Implement tests for spinlocks.
  */
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <future>
 #include <mutex>
 #include <vector>

diff --git a/test/ci/CMakeLists.txt b/test/ci/CMakeLists.txt
@@ -7,6 +7,11 @@ add_executable(
   test_assert.cc
 )
 
+target_include_directories(test_assert
+  PRIVATE
+    "${TILEDB_CORE_INCLUDE_DIR}"
+)
+
 target_link_libraries(test_assert PUBLIC Catch2::Catch2)
 
 if (TILEDB_ASSERTIONS)
@@ -41,4 +46,4 @@ add_dependencies(test_assert try_assert)
 add_test(
   NAME "test_ci_asserts"
   COMMAND test_assert
-)
+)
diff --git a/test/ci/test_assert.cc b/test/ci/test_assert.cc
@@ -32,7 +32,7 @@
  */
 
 #define CATCH_CONFIG_MAIN
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 
 #include <cassert>
 #include <iostream>

diff --git a/test/performance/msys_handle_leakage/unit-cppapi-consolidation-with-timestamps.cc b/test/performance/msys_handle_leakage/unit-cppapi-consolidation-with-timestamps.cc
@@ -30,7 +30,7 @@
  * Tests the CPP API consolidation with timestamps.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "test/src/helpers.h"
 #include "tiledb/sm/array/array_directory.h"
 #include "tiledb/sm/c_api/tiledb_struct_def.h"

diff --git a/test/performance/msys_handle_leakage/unit.cc b/test/performance/msys_handle_leakage/unit.cc
@@ -99,7 +99,7 @@ after  70
   */
 
 #define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 
 #include <cstdlib>
 #include <iostream>

diff --git a/test/regression/CMakeLists.txt b/test/regression/CMakeLists.txt
@@ -25,6 +25,8 @@
 # THE SOFTWARE.
 #
 
+set(TILEDB_CORE_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../..")
+
 find_package(Catch_EP REQUIRED)
 
 set(SOURCES
@@ -61,6 +63,7 @@ target_link_libraries(tiledb_regression
 target_include_directories(tiledb_regression
   PRIVATE
     ${CMAKE_INSTALL_PREFIX}/include
+    "${TILEDB_CORE_INCLUDE_DIR}"
 )
 
 add_test(

diff --git a/test/regression/regression.cc b/test/regression/regression.cc
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 
 int main(const int argc, char** const argv) {
   Catch::Session session;

diff --git a/test/regression/targets/sc-12024.cc b/test/regression/targets/sc-12024.cc
@@ -1,6 +1,6 @@
 #include <tiledb/tiledb>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 
 #include <chrono>
 #include <thread>

diff --git a/test/regression/targets/sc-15387.cc b/test/regression/targets/sc-15387.cc
@@ -1,6 +1,6 @@
 #include <tiledb/tiledb>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 
 #include <chrono>
 #include <thread>

diff --git a/test/regression/targets/sc-18250.cc b/test/regression/targets/sc-18250.cc
@@ -3,7 +3,7 @@
 #include <tiledb/tiledb.h>
 #include <tiledb/tiledb_serialization.h>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 
 static const char* schema_str = R"rstr(
 {"arrayType":"dense","attributes":[{

diff --git a/test/regression/targets/sc-18836.cc b/test/regression/targets/sc-18836.cc
@@ -3,7 +3,7 @@
 #include <tiledb/tiledb>
 #include <future>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 
 using namespace tiledb;
 

diff --git a/test/regression/targets/sc-19240_cppapi-vfs-exception.cc b/test/regression/targets/sc-19240_cppapi-vfs-exception.cc
@@ -1,7 +1,7 @@
 #include <iostream>
 #include <tiledb/tiledb>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 
 TEST_CASE(
     "C++ API: test exception handling in VFSFileBuf interface",

diff --git a/test/src/cpp-integration-query-condition.cc b/test/src/cpp-integration-query-condition.cc
@@ -36,7 +36,7 @@
 #include <iostream>
 #include <vector>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "tiledb/sm/cpp_api/tiledb"
 #include "tiledb/sm/misc/utils.h"
 

diff --git a/test/src/helpers.cc b/test/src/helpers.cc
@@ -31,7 +31,7 @@
  */
 
 #include "helpers.h"
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "serialization_wrappers.h"
 #include "tiledb/common/logger.h"
 #include "tiledb/sm/c_api/tiledb_struct_def.h"

diff --git a/test/src/serialization_wrappers.cc b/test/src/serialization_wrappers.cc
@@ -31,8 +31,8 @@
  * through serialization.
  */
 
+#include <test/support/tdb_catch.h>
 #include <string>
-#include "catch.hpp"
 #include "tiledb/sm/c_api/tiledb.h"
 #include "tiledb/sm/c_api/tiledb_serialization.h"
 

diff --git a/test/src/test-capi-dimension_labels.cc b/test/src/test-capi-dimension_labels.cc
@@ -48,7 +48,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 #include <string>
 #include <unordered_map>

diff --git a/test/src/unit-CellSlabIter.cc b/test/src/unit-CellSlabIter.cc
@@ -41,7 +41,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-DenseTiler.cc b/test/src/unit-DenseTiler.cc
@@ -36,7 +36,7 @@
 #include "tiledb/sm/cpp_api/tiledb"
 #include "tiledb/sm/query/writers/dense_tiler.h"
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb;

diff --git a/test/src/unit-QueryCondition-serialization.cc b/test/src/unit-QueryCondition-serialization.cc
@@ -42,7 +42,7 @@
 #include "tiledb/sm/enums/query_condition_op.h"
 #include "tiledb/sm/query/query_condition.h"
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-ReadCellSlabIter.cc b/test/src/unit-ReadCellSlabIter.cc
@@ -44,7 +44,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-Reader.cc b/test/src/unit-Reader.cc
@@ -48,7 +48,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-Subarray.cc b/test/src/unit-Subarray.cc
@@ -41,7 +41,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-SubarrayPartitioner-dense.cc b/test/src/unit-SubarrayPartitioner-dense.cc
@@ -41,7 +41,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::common;

diff --git a/test/src/unit-SubarrayPartitioner-error.cc b/test/src/unit-SubarrayPartitioner-error.cc
@@ -41,7 +41,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::common;

diff --git a/test/src/unit-SubarrayPartitioner-sparse.cc b/test/src/unit-SubarrayPartitioner-sparse.cc
@@ -41,7 +41,7 @@
 #include "tiledb/sm/filesystem/posix.h"
 #endif
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::common;

diff --git a/test/src/unit-Tile.cc b/test/src/unit-Tile.cc
@@ -33,7 +33,7 @@
 #include "tiledb/sm/enums/datatype.h"
 #include "tiledb/sm/tile/tile.h"
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-TileDomain.cc b/test/src/unit-TileDomain.cc
@@ -31,7 +31,7 @@
  * Tests for class TileDomain.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "tiledb/sm/array_schema/tile_domain.h"
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-arrow.cc b/test/src/unit-arrow.cc
@@ -30,7 +30,7 @@
  * Tests for the TileDB Arrow integration.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "helpers.h"
 #include "tiledb/sm/cpp_api/arrowio"
 #include "tiledb/sm/cpp_api/tiledb"

diff --git a/test/src/unit-azure.cc b/test/src/unit-azure.cc
@@ -32,7 +32,7 @@
 
 #ifdef HAVE_AZURE
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "tiledb/common/filesystem/directory_entry.h"
 #include "tiledb/common/thread_pool.h"
 #include "tiledb/sm/config/config.h"

diff --git a/test/src/unit-backwards_compat.cc b/test/src/unit-backwards_compat.cc
@@ -31,7 +31,7 @@
  * Tests of backwards compatibility for opening/reading arrays.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "test/src/helpers.h"
 #include "tiledb/common/common.h"
 #include "tiledb/sm/cpp_api/tiledb"

diff --git a/test/src/unit-bufferlist.cc b/test/src/unit-bufferlist.cc
@@ -35,7 +35,7 @@
 #include "tiledb/sm/c_api/tiledb.h"
 #include "tiledb/sm/c_api/tiledb_struct_def.h"
 
-#include <catch.hpp>
+#include <test/support/tdb_catch.h>
 #include <iostream>
 
 using namespace tiledb::sm;

diff --git a/test/src/unit-bytevecvalue.cc b/test/src/unit-bytevecvalue.cc
@@ -37,7 +37,7 @@
 #include "test/src/helpers.h"
 #include "tiledb/sm/misc/types.h"
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 
 using namespace tiledb::sm;
 

diff --git a/test/src/unit-capi-any.cc b/test/src/unit-capi-any.cc
@@ -31,7 +31,7 @@
  * Tests for TileDB's ANY datatype at the C API level.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "tiledb/sm/c_api/tiledb.h"
 
 #include <cstring>

diff --git a/test/src/unit-capi-array.cc b/test/src/unit-capi-array.cc
@@ -31,12 +31,11 @@
  * Tests of C API for (dense or sparse) array operations.
  */
 
-#include "catch.hpp"
 #include "tiledb/sm/c_api/tiledb.h"
 
 #include <iostream>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "test/src/helpers.h"
 #include "test/src/vfs_helpers.h"
 #ifdef _WIN32
@@ -2168,4 +2167,4 @@ TEST_CASE_METHOD(
 
   remove_temp_dir(local_fs.file_prefix() + local_fs.temp_dir());
 #endif
-}
+}
diff --git a/test/src/unit-capi-array_schema.cc b/test/src/unit-capi-array_schema.cc
@@ -38,7 +38,7 @@
 #include <sstream>
 #include <thread>
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "test/src/helpers.h"
 #include "test/src/vfs_helpers.h"
 #ifdef _WIN32

diff --git a/test/src/unit-capi-async.cc b/test/src/unit-capi-async.cc
@@ -30,7 +30,7 @@
  * Tests the C API async queries.
  */
 
-#include "catch.hpp"
+#include <test/support/tdb_catch.h>
 #include "test/src/helpers.h"
 #include "tiledb/sm/c_api/tiledb.h"