Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMartin Hořeňovský2020-01-21 15:03:07 +0100
committerMartin Hořeňovský2020-01-21 15:03:07 +0100
commit2b696c43880cdfa25dc6d13799799774eed0bb5a (patch)
tree353459eff0c7c9899570f453af630df89248c265
parent17281c09c3f6ea3a04adfc12a651bcd97bcdc496 (diff)
downloadcatch3-2b696c43880cdfa25dc6d13799799774eed0bb5a.tar.gz
Piecemeal includes in extra-tests
-rw-r--r--tests/ExtraTests/X02-DisabledMacros.cpp2
-rw-r--r--tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp2
-rw-r--r--tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp2
-rw-r--r--tests/ExtraTests/X10-FallbackStringifier.cpp2
-rw-r--r--tests/ExtraTests/X11-DisableStringification.cpp2
-rw-r--r--tests/ExtraTests/X20-BenchmarkingMacros.cpp4
-rw-r--r--tests/ExtraTests/X90-WindowsHeaderInclusion.cpp2
7 files changed, 9 insertions, 7 deletions
diff --git a/tests/ExtraTests/X02-DisabledMacros.cpp b/tests/ExtraTests/X02-DisabledMacros.cpp
index 2ed54db3..0577da09 100644
--- a/tests/ExtraTests/X02-DisabledMacros.cpp
+++ b/tests/ExtraTests/X02-DisabledMacros.cpp
@@ -3,7 +3,7 @@
// and expressions in assertion macros are not run.
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
#include <iostream>
diff --git a/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp b/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
index 07fac7e8..fb72826e 100644
--- a/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
+++ b/tests/ExtraTests/X03-DisabledExceptions-DefaultHandler.cpp
@@ -1,5 +1,5 @@
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
TEST_CASE("Tests that run") {
// All of these should be run and be reported
diff --git a/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp b/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
index 028d05bd..82d6edfa 100644
--- a/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
+++ b/tests/ExtraTests/X04-DisabledExceptions-CustomHandler.cpp
@@ -1,5 +1,5 @@
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
namespace Catch {
[[noreturn]]
diff --git a/tests/ExtraTests/X10-FallbackStringifier.cpp b/tests/ExtraTests/X10-FallbackStringifier.cpp
index bf6601db..a52f371f 100644
--- a/tests/ExtraTests/X10-FallbackStringifier.cpp
+++ b/tests/ExtraTests/X10-FallbackStringifier.cpp
@@ -10,7 +10,7 @@ std::string fallbackStringifier(T const&) {
}
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
struct foo {
explicit operator bool() const {
diff --git a/tests/ExtraTests/X11-DisableStringification.cpp b/tests/ExtraTests/X11-DisableStringification.cpp
index 23f49f5f..79d4f6b4 100644
--- a/tests/ExtraTests/X11-DisableStringification.cpp
+++ b/tests/ExtraTests/X11-DisableStringification.cpp
@@ -5,7 +5,7 @@
// will be deleted soon :-)
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
struct Hidden {};
diff --git a/tests/ExtraTests/X20-BenchmarkingMacros.cpp b/tests/ExtraTests/X20-BenchmarkingMacros.cpp
index b5010609..6704753e 100644
--- a/tests/ExtraTests/X20-BenchmarkingMacros.cpp
+++ b/tests/ExtraTests/X20-BenchmarkingMacros.cpp
@@ -2,7 +2,9 @@
// Test that the benchmarking support macros compile properly with the single header
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/benchmark/catch_benchmark.hpp>
+#include <catch2/catch_generators_specific.hpp>
namespace {
std::uint64_t factorial(std::uint64_t number) {
diff --git a/tests/ExtraTests/X90-WindowsHeaderInclusion.cpp b/tests/ExtraTests/X90-WindowsHeaderInclusion.cpp
index 0a2bdb55..375b66db 100644
--- a/tests/ExtraTests/X90-WindowsHeaderInclusion.cpp
+++ b/tests/ExtraTests/X90-WindowsHeaderInclusion.cpp
@@ -5,7 +5,7 @@
#include <windows.h>
#include <catch2/catch_default_main.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
TEST_CASE("Catch2 did survive compilation with windows.h", "[compile-test]") {
SUCCEED();