diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt index 3aa2d0c0b4..7478cf4eba 100644 --- a/tests/SelfTest/Baselines/console.std.approved.txt +++ b/tests/SelfTest/Baselines/console.std.approved.txt @@ -1523,16 +1523,6 @@ due to unexpected exception with message: Why would you throw a std::string? =============================================================================== -<<<<<<< HEAD -<<<<<<< HEAD -test cases: 394 | 318 passed | 69 failed | 7 failed as expected -assertions: 2284 | 2129 passed | 128 failed | 27 failed as expected -======= -test cases: 395 | 314 passed | 69 failed | 8 failed as expected | 4 skipped -assertions: 2232 | 2070 passed | 128 failed | 28 failed as expected | 6 skipped ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= -test cases: 399 | 314 passed | 69 failed | 10 failed as expected | 6 skipped -assertions: 2231 | 2072 passed | 128 failed | 31 failed as expected ->>>>>>> Don't show "skipped assertions" in console reporter +test cases: 403 | 318 passed | 69 failed | 10 failed as expected | 6 skipped +assertions: 2292 | 2133 passed | 128 failed | 31 failed as expected diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt index 7eeb773a29..1769c3da43 100644 --- a/tests/SelfTest/Baselines/console.sw.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.approved.txt @@ -18628,16 +18628,6 @@ Misc.tests.cpp: Misc.tests.cpp:: PASSED: =============================================================================== -<<<<<<< HEAD -<<<<<<< HEAD -test cases: 394 | 304 passed | 83 failed | 7 failed as expected -assertions: 2299 | 2129 passed | 143 failed | 27 failed as expected -======= -test cases: 395 | 300 passed | 83 failed | 8 failed as expected | 4 skipped -assertions: 2247 | 2070 passed | 143 failed | 28 failed as expected | 6 skipped ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= -test cases: 399 | 300 passed | 84 failed | 10 failed as expected | 5 skipped -assertions: 2248 | 2072 passed | 145 failed | 31 failed as expected ->>>>>>> Don't show "skipped assertions" in console reporter +test cases: 403 | 304 passed | 84 failed | 10 failed as expected | 5 skipped +assertions: 2309 | 2133 passed | 145 failed | 31 failed as expected diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt index a3aeae476d..6b963edf5b 100644 --- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt @@ -18617,16 +18617,6 @@ Misc.tests.cpp: Misc.tests.cpp:: PASSED: =============================================================================== -<<<<<<< HEAD -<<<<<<< HEAD -test cases: 394 | 304 passed | 83 failed | 7 failed as expected -assertions: 2299 | 2129 passed | 143 failed | 27 failed as expected -======= -test cases: 395 | 300 passed | 83 failed | 8 failed as expected | 4 skipped -assertions: 2247 | 2070 passed | 143 failed | 28 failed as expected | 6 skipped ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= -test cases: 399 | 300 passed | 84 failed | 10 failed as expected | 5 skipped -assertions: 2248 | 2072 passed | 145 failed | 31 failed as expected ->>>>>>> Don't show "skipped assertions" in console reporter +test cases: 403 | 304 passed | 84 failed | 10 failed as expected | 5 skipped +assertions: 2309 | 2133 passed | 145 failed | 31 failed as expected diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt index dd31b62caf..1fd9ec3a34 100644 --- a/tests/SelfTest/Baselines/junit.sw.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.approved.txt @@ -1,15 +1,7 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= - ->>>>>>> Don't show "skipped assertions" in console reporter + diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt index 3d2ee0fe02..b67f83f4c9 100644 --- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt @@ -1,14 +1,6 @@ -<<<<<<< HEAD -<<<<<<< HEAD - -======= - ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= - ->>>>>>> Don't show "skipped assertions" in console reporter + diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt index 1dbd5203bf..a27592fd73 100644 --- a/tests/SelfTest/Baselines/tap.sw.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.approved.txt @@ -3883,7 +3883,7 @@ ok {test-number} - stream.str(), ContainsSubstring(R"(attr1="true")") && Contain # a succeeding test can still be skipped ok {test-number} - # a succeeding test can still be skipped -** internal error ** 1878 - +** internal error ** 1938 - # analyse no analysis ok {test-number} - analysis.mean.point.count() == 23 for: 23.0 == 23 # analyse no analysis @@ -4055,11 +4055,11 @@ ok {test-number} - convertToBits( std::numeric_limits::denorm_min() ) == # convertToBits ok {test-number} - convertToBits( std::numeric_limits::denorm_min() ) == 1 for: 1 == 1 # dynamic skipping works with generators -** internal error ** 1964 - +** internal error ** 2024 - # dynamic skipping works with generators ok {test-number} - # dynamic skipping works with generators -** internal error ** 1966 - +** internal error ** 2026 - # empty tags are not allowed ok {test-number} - Catch::TestCaseInfo("", { "test with an empty tag", "[]" }, dummySourceLineInfo) # erfc_inv @@ -4081,17 +4081,17 @@ ok {test-number} - # failed assertions before SKIP cause test case to fail not ok {test-number} - 3 == 4 # failed assertions before SKIP cause test case to fail -** internal error ** 1977 - +** internal error ** 2037 - # failing for some generator values causes entire test case to fail not ok {test-number} - explicitly # failing for some generator values causes entire test case to fail -** internal error ** 1979 - +** internal error ** 2039 - # failing for some generator values causes entire test case to fail not ok {test-number} - explicitly # failing for some generator values causes entire test case to fail -** internal error ** 1981 - +** internal error ** 2041 - # failing in some unskipped sections causes entire test case to fail -** internal error ** 1982 - +** internal error ** 2042 - # failing in some unskipped sections causes entire test case to fail not ok {test-number} - explicitly loose text artifact @@ -4206,7 +4206,7 @@ ok {test-number} - a != b for: 1 != 2 a! b1! # nested sections can be skipped dynamically at runtime -** internal error ** 2037 - +** internal error ** 2098 - ! # non streamable - with conv. op ok {test-number} - s == "7" for: "7" == "7" @@ -4375,7 +4375,7 @@ ok {test-number} - Timing.iterations >= time.count() for: 128 >= 100 # sections can be skipped dynamically at runtime ok {test-number} - # sections can be skipped dynamically at runtime -** internal error ** 2121 - +** internal error ** 2182 - # sections can be skipped dynamically at runtime ok {test-number} - # send a single char to INFO @@ -4385,7 +4385,7 @@ not ok {test-number} - false with 2 messages: 'hi' and 'i := 7' # shortened hide tags are split apart ok {test-number} - testcase.tags, VectorContains( Tag( "magic-tag" ) ) && VectorContains( Tag( "."_catch_sr ) ) for: { {?}, {?} } ( Contains: {?} and Contains: {?} ) # skipped tests can optionally provide a reason -** internal error ** 2126 - +** internal error ** 2187 - # splitString ok {test-number} - splitStringRef("", ','), Equals(std::vector()) for: { } Equals: { } # splitString @@ -4469,7 +4469,7 @@ ok {test-number} - testcase.tags.size() == 1 for: 1 == 1 # tags with dots in later positions are not parsed as hidden ok {test-number} - testcase.tags[0].original == "magic.tag"_catch_sr for: magic.tag == magic.tag # tests can be skipped dynamically at runtime -** internal error ** 2168 - +** internal error ** 2229 - # thrown std::strings are translated not ok {test-number} - unexpected exception with message: 'Why would you throw a std::string?' # toString on const wchar_t const pointer returns the string contents @@ -4642,13 +4642,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0 ok {test-number} - # xmlentitycheck ok {test-number} - -<<<<<<< HEAD -<<<<<<< HEAD -1..2299 -======= -1..2247 ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= -1..2259 ->>>>>>> Don't show "skipped assertions" in console reporter +1..2320 diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt index 0f281d2340..cab813539d 100644 --- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt @@ -3876,7 +3876,7 @@ ok {test-number} - stream.str(), ContainsSubstring(R"(attr1="true")") && Contain # a succeeding test can still be skipped ok {test-number} - # a succeeding test can still be skipped -** internal error ** 1878 - +** internal error ** 1938 - # analyse no analysis ok {test-number} - analysis.mean.point.count() == 23 for: 23.0 == 23 # analyse no analysis @@ -4048,11 +4048,11 @@ ok {test-number} - convertToBits( std::numeric_limits::denorm_min() ) == # convertToBits ok {test-number} - convertToBits( std::numeric_limits::denorm_min() ) == 1 for: 1 == 1 # dynamic skipping works with generators -** internal error ** 1964 - +** internal error ** 2024 - # dynamic skipping works with generators ok {test-number} - # dynamic skipping works with generators -** internal error ** 1966 - +** internal error ** 2026 - # empty tags are not allowed ok {test-number} - Catch::TestCaseInfo("", { "test with an empty tag", "[]" }, dummySourceLineInfo) # erfc_inv @@ -4074,17 +4074,17 @@ ok {test-number} - # failed assertions before SKIP cause test case to fail not ok {test-number} - 3 == 4 # failed assertions before SKIP cause test case to fail -** internal error ** 1977 - +** internal error ** 2037 - # failing for some generator values causes entire test case to fail not ok {test-number} - explicitly # failing for some generator values causes entire test case to fail -** internal error ** 1979 - +** internal error ** 2039 - # failing for some generator values causes entire test case to fail not ok {test-number} - explicitly # failing for some generator values causes entire test case to fail -** internal error ** 1981 - +** internal error ** 2041 - # failing in some unskipped sections causes entire test case to fail -** internal error ** 1982 - +** internal error ** 2042 - # failing in some unskipped sections causes entire test case to fail not ok {test-number} - explicitly # is_unary_function @@ -4196,7 +4196,7 @@ ok {test-number} - b != a for: 2 != 1 # nested SECTION tests ok {test-number} - a != b for: 1 != 2 # nested sections can be skipped dynamically at runtime -** internal error ** 2037 - +** internal error ** 2098 - # non streamable - with conv. op ok {test-number} - s == "7" for: "7" == "7" # non-copyable objects @@ -4364,7 +4364,7 @@ ok {test-number} - Timing.iterations >= time.count() for: 128 >= 100 # sections can be skipped dynamically at runtime ok {test-number} - # sections can be skipped dynamically at runtime -** internal error ** 2121 - +** internal error ** 2182 - # sections can be skipped dynamically at runtime ok {test-number} - # send a single char to INFO @@ -4374,7 +4374,7 @@ not ok {test-number} - false with 2 messages: 'hi' and 'i := 7' # shortened hide tags are split apart ok {test-number} - testcase.tags, VectorContains( Tag( "magic-tag" ) ) && VectorContains( Tag( "."_catch_sr ) ) for: { {?}, {?} } ( Contains: {?} and Contains: {?} ) # skipped tests can optionally provide a reason -** internal error ** 2126 - +** internal error ** 2187 - # splitString ok {test-number} - splitStringRef("", ','), Equals(std::vector()) for: { } Equals: { } # splitString @@ -4458,7 +4458,7 @@ ok {test-number} - testcase.tags.size() == 1 for: 1 == 1 # tags with dots in later positions are not parsed as hidden ok {test-number} - testcase.tags[0].original == "magic.tag"_catch_sr for: magic.tag == magic.tag # tests can be skipped dynamically at runtime -** internal error ** 2168 - +** internal error ** 2229 - # thrown std::strings are translated not ok {test-number} - unexpected exception with message: 'Why would you throw a std::string?' # toString on const wchar_t const pointer returns the string contents @@ -4631,13 +4631,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0 ok {test-number} - # xmlentitycheck ok {test-number} - -<<<<<<< HEAD -<<<<<<< HEAD -1..2299 -======= -1..2247 ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= -1..2259 ->>>>>>> Don't show "skipped assertions" in console reporter +1..2320 diff --git a/tests/SelfTest/Baselines/xml.sw.approved.txt b/tests/SelfTest/Baselines/xml.sw.approved.txt index a05c44a57e..66e21a2704 100644 --- a/tests/SelfTest/Baselines/xml.sw.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.approved.txt @@ -21779,16 +21779,6 @@ b1! -<<<<<<< HEAD -<<<<<<< HEAD - - -======= - - ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= - - ->>>>>>> Don't show "skipped assertions" in console reporter + + diff --git a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt index 49b4ada6cd..0a7278de2e 100644 --- a/tests/SelfTest/Baselines/xml.sw.multi.approved.txt +++ b/tests/SelfTest/Baselines/xml.sw.multi.approved.txt @@ -21778,16 +21778,6 @@ b1! -<<<<<<< HEAD -<<<<<<< HEAD - - -======= - - ->>>>>>> Add new SKIP macro for skipping tests at runtime -======= - - ->>>>>>> Don't show "skipped assertions" in console reporter + +