From 775b8c93e28eb2026ba166857bd31a7ca4c4364d Mon Sep 17 00:00:00 2001 From: ado Date: Mon, 19 Feb 2024 00:16:22 +0100 Subject: [PATCH] Fix parser tests part 2 segment issues --- include/ss/setup.hpp | 2 +- test/test_parser2_4.cpp | 4 ++-- test/test_parser2_5.cpp | 4 ++-- test/test_parser2_6.cpp | 11 ++--------- 4 files changed, 7 insertions(+), 14 deletions(-) diff --git a/include/ss/setup.hpp b/include/ss/setup.hpp index fd41da5..80cf4d5 100644 --- a/include/ss/setup.hpp +++ b/include/ss/setup.hpp @@ -109,7 +109,7 @@ struct get_matcher { struct is_matcher : is_instance_of_matcher {}; static_assert(count_v <= 1, - "the same matcher cannot" + "the same matcher cannot " "be defined multiple times"); using type = std::conditional_t::value, T, typename get_matcher::type>; diff --git a/test/test_parser2_4.cpp b/test/test_parser2_4.cpp index 776f49a..ea78aaf 100644 --- a/test/test_parser2_4.cpp +++ b/test/test_parser2_4.cpp @@ -1,7 +1,7 @@ -#define SEGMENT_NAME "segment3" +#define SEGMENT_NAME "segment4" #include "test_parser2.hpp" -TEST_CASE("parser test various cases version 2 segment 3") { +TEST_CASE("parser test various cases version 2 segment 4") { #ifdef CMAKE_GITHUB_CI using quote = ss::quote<'"'>; using escape = ss::escape<'\\'>; diff --git a/test/test_parser2_5.cpp b/test/test_parser2_5.cpp index 71ae35f..3f345b0 100644 --- a/test/test_parser2_5.cpp +++ b/test/test_parser2_5.cpp @@ -1,7 +1,7 @@ -#define SEGMENT_NAME "segment3" +#define SEGMENT_NAME "segment5" #include "test_parser2.hpp" -TEST_CASE("parser test various cases version 2 segment 3") { +TEST_CASE("parser test various cases version 2 segment 5") { #ifdef CMAKE_GITHUB_CI using quote = ss::quote<'"'>; using escape = ss::escape<'\\'>; diff --git a/test/test_parser2_6.cpp b/test/test_parser2_6.cpp index 49c429b..d6ec30f 100644 --- a/test/test_parser2_6.cpp +++ b/test/test_parser2_6.cpp @@ -1,18 +1,11 @@ -#define SEGMENT_NAME "segment4" +#define SEGMENT_NAME "segment6" #include "test_parser2.hpp" -TEST_CASE("parser test various cases version 2 segment 4") { +TEST_CASE("parser test various cases version 2 segment 6") { using quote = ss::quote<'"'>; using escape = ss::escape<'\\'>; using multiline = ss::multiline; -#ifdef CMAKE_GITHUB_CI - using trim = ss::trim<' '>; - test_option_combinations3(); - test_option_combinations3(); -#else - test_option_combinations3(); -#endif }