From 443fa0fc8878f4e270ae4f64331ee52b70722fe1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Sat, 30 Nov 2019 17:41:17 +0100 Subject: [PATCH] Fixing paths in SelfTest --- projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp | 8 ++++---- .../SelfTest/IntrospectiveTests/PartTracker.tests.cpp | 4 ++-- .../IntrospectiveTests/RandomNumberGeneration.tests.cpp | 2 +- projects/SelfTest/IntrospectiveTests/String.tests.cpp | 2 +- .../SelfTest/IntrospectiveTests/StringManip.tests.cpp | 2 +- projects/SelfTest/IntrospectiveTests/Tag.tests.cpp | 2 +- projects/SelfTest/IntrospectiveTests/ToString.tests.cpp | 2 +- projects/SelfTest/IntrospectiveTests/Xml.tests.cpp | 2 +- projects/SelfTest/SurrogateCpps/catch_console_colour.cpp | 4 ++-- projects/SelfTest/SurrogateCpps/catch_debugger.cpp | 2 +- .../SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp | 4 ++-- projects/SelfTest/SurrogateCpps/catch_option.cpp | 4 ++-- projects/SelfTest/SurrogateCpps/catch_stream.cpp | 4 ++-- .../SelfTest/SurrogateCpps/catch_test_case_tracker.cpp | 2 +- projects/SelfTest/SurrogateCpps/catch_test_spec.cpp | 4 ++-- projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp | 6 +++--- 16 files changed, 27 insertions(+), 27 deletions(-) diff --git a/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp b/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp index d5ebeb18..3154782e 100644 --- a/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/CmdLine.tests.cpp @@ -7,10 +7,10 @@ */ #include "catch.hpp" -#include "internal/catch_test_spec_parser.h" -#include "internal/catch_test_case_info.h" -#include "internal/catch_config.hpp" -#include "internal/catch_commandline.h" +#include "catch_test_spec_parser.h" +#include "catch_test_case_info.h" +#include "catch_config.hpp" +#include "catch_commandline.h" #ifdef __clang__ # pragma clang diagnostic ignored "-Wc++98-compat" diff --git a/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp b/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp index 837d3661..d0ef5875 100644 --- a/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/PartTracker.tests.cpp @@ -5,8 +5,8 @@ * Distributed under the Boost Software License, Version 1.0. (See accompanying * file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) */ -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_test_case_tracker.h" +#include "catch_suppress_warnings.h" +#include "catch_test_case_tracker.h" #include "catch.hpp" diff --git a/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp b/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp index f8085dbf..8227fd4d 100644 --- a/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/RandomNumberGeneration.tests.cpp @@ -7,7 +7,7 @@ #include "catch.hpp" -#include "internal/catch_random_number_generator.h" +#include "catch_random_number_generator.h" TEST_CASE("Our PCG implementation provides expected results for known seeds", "[rng]") { Catch::SimplePcg32 rng; diff --git a/projects/SelfTest/IntrospectiveTests/String.tests.cpp b/projects/SelfTest/IntrospectiveTests/String.tests.cpp index 3a308657..6781106e 100644 --- a/projects/SelfTest/IntrospectiveTests/String.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/String.tests.cpp @@ -1,4 +1,4 @@ -#include "internal/catch_stringref.h" +#include "catch_stringref.h" #include "catch.hpp" diff --git a/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp b/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp index b817f372..3157d27e 100644 --- a/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/StringManip.tests.cpp @@ -1,4 +1,4 @@ -#include "internal/catch_string_manip.h" +#include "catch_string_manip.h" #include "catch.hpp" diff --git a/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp b/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp index 5120d8ed..6e063973 100644 --- a/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/Tag.tests.cpp @@ -7,7 +7,7 @@ */ #include "catch.hpp" -#include "internal/catch_tag_alias_registry.h" +#include "catch_tag_alias_registry.h" TEST_CASE( "Tag alias can be registered against tag patterns" ) { diff --git a/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp b/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp index caa924f5..7d5e488c 100644 --- a/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/ToString.tests.cpp @@ -1,6 +1,6 @@ #include "catch.hpp" -#include "internal/catch_enum_values_registry.h" +#include "catch_enum_values_registry.h" enum class EnumClass3 { Value1, Value2, Value3, Value4 }; diff --git a/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp b/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp index bf6c8602..6880e5b4 100644 --- a/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp +++ b/projects/SelfTest/IntrospectiveTests/Xml.tests.cpp @@ -1,5 +1,5 @@ #include "catch.hpp" -#include "internal/catch_xmlwriter.h" +#include "catch_xmlwriter.h" #include diff --git a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp index a2377500..7bc87509 100644 --- a/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_console_colour.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_console_colour.h" +#include "catch_suppress_warnings.h" +#include "catch_console_colour.h" diff --git a/projects/SelfTest/SurrogateCpps/catch_debugger.cpp b/projects/SelfTest/SurrogateCpps/catch_debugger.cpp index 04f4e071..33f76ae6 100644 --- a/projects/SelfTest/SurrogateCpps/catch_debugger.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_debugger.cpp @@ -1,2 +1,2 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_debugger.h" +#include "catch_debugger.h" diff --git a/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp b/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp index f3c71585..544f9d0f 100644 --- a/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_interfaces_reporter.cpp @@ -1,2 +1,2 @@ -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_interfaces_reporter.h" +#include "catch_suppress_warnings.h" +#include "catch_interfaces_reporter.h" diff --git a/projects/SelfTest/SurrogateCpps/catch_option.cpp b/projects/SelfTest/SurrogateCpps/catch_option.cpp index a4ca37c2..35e32829 100644 --- a/projects/SelfTest/SurrogateCpps/catch_option.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_option.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_option.hpp" +#include "catch_suppress_warnings.h" +#include "catch_option.hpp" diff --git a/projects/SelfTest/SurrogateCpps/catch_stream.cpp b/projects/SelfTest/SurrogateCpps/catch_stream.cpp index a76d8413..7aaffa1e 100644 --- a/projects/SelfTest/SurrogateCpps/catch_stream.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_stream.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_stream.h" +#include "catch_suppress_warnings.h" +#include "catch_stream.h" diff --git a/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp b/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp index 0d697b0f..09fda590 100644 --- a/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_test_case_tracker.cpp @@ -1,2 +1,2 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_test_case_tracker.h" +#include "catch_test_case_tracker.h" diff --git a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp index 8be135ec..ac9993b6 100644 --- a/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_test_spec.cpp @@ -1,3 +1,3 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_test_spec.h" +#include "catch_suppress_warnings.h" +#include "catch_test_spec.h" diff --git a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp index 930e3825..520e159d 100644 --- a/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp +++ b/projects/SelfTest/SurrogateCpps/catch_xmlwriter.cpp @@ -1,4 +1,4 @@ // This file is only here to verify (to the extent possible) the self sufficiency of the header -#include "internal/catch_suppress_warnings.h" -#include "internal/catch_xmlwriter.h" -#include "internal/catch_reenable_warnings.h" +#include "catch_suppress_warnings.h" +#include "catch_xmlwriter.h" +#include "catch_reenable_warnings.h"