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

summaryrefslogtreecommitdiffhomepage
path: root/tests/SelfTest
diff options
context:
space:
mode:
authorMartin Hořeňovský2022-01-26 23:47:40 +0100
committerMartin Hořeňovský2022-01-27 21:11:51 +0100
commit4ff8b27bb6bed4b8b309e56cd269b4f1fbc24e89 (patch)
treef4186911b20161e359d788bd200614159bea28a5 /tests/SelfTest
parentd861e73f86a7c6c7482337e4194d8f9f3ce1f00e (diff)
downloadcatch3-4ff8b27bb6bed4b8b309e56cd269b4f1fbc24e89.tar.gz
Cleanups output normalization in ApprovalTests
Removed: * NaN normalization * INFINITY normalization * errno normalization * Completely unused duration regex Tests using these macros should be tagged `[approvals]` so they are not run as part of approval tests. Also simplified regex for the test's executable filename, and hidden some tests relying on nullptr normalization.
Diffstat (limited to 'tests/SelfTest')
-rw-r--r--tests/SelfTest/Baselines/automake.sw.approved.txt4
-rw-r--r--tests/SelfTest/Baselines/automake.sw.multi.approved.txt4
-rw-r--r--tests/SelfTest/Baselines/compact.sw.approved.txt7
-rw-r--r--tests/SelfTest/Baselines/compact.sw.multi.approved.txt7
-rw-r--r--tests/SelfTest/Baselines/console.std.approved.txt6
-rw-r--r--tests/SelfTest/Baselines/console.sw.approved.txt38
-rw-r--r--tests/SelfTest/Baselines/console.sw.multi.approved.txt38
-rw-r--r--tests/SelfTest/Baselines/console.swa4.approved.txt25
-rw-r--r--tests/SelfTest/Baselines/junit.sw.approved.txt6
-rw-r--r--tests/SelfTest/Baselines/junit.sw.multi.approved.txt6
-rw-r--r--tests/SelfTest/Baselines/sonarqube.sw.approved.txt4
-rw-r--r--tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt4
-rw-r--r--tests/SelfTest/Baselines/tap.sw.approved.txt14
-rw-r--r--tests/SelfTest/Baselines/tap.sw.multi.approved.txt14
-rw-r--r--tests/SelfTest/Baselines/teamcity.sw.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/teamcity.sw.multi.approved.txt8
-rw-r--r--tests/SelfTest/Baselines/xml.sw.approved.txt40
-rw-r--r--tests/SelfTest/Baselines/xml.sw.multi.approved.txt40
-rw-r--r--tests/SelfTest/UsageTests/Decomposition.tests.cpp2
-rw-r--r--tests/SelfTest/UsageTests/Misc.tests.cpp9
-rw-r--r--tests/SelfTest/UsageTests/ToStringTuple.tests.cpp3
21 files changed, 54 insertions, 233 deletions
diff --git a/tests/SelfTest/Baselines/automake.sw.approved.txt b/tests/SelfTest/Baselines/automake.sw.approved.txt
index 1fff117c..c575637f 100644
--- a/tests/SelfTest/Baselines/automake.sw.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.approved.txt
@@ -1,5 +1,4 @@
:test-result: PASS # A test name that starts with a #
-:test-result: PASS #1005: Comparing pointer to int and long (NULL can be either on various systems)
:test-result: PASS #1027: Bitfields can be captured
:test-result: PASS #1147
:test-result: PASS #1175 - Hidden Test
@@ -29,7 +28,7 @@ Nor would this
:test-result: XFAIL #748 - captures with unexpected exceptions
:test-result: PASS #809
:test-result: PASS #833
-:test-result: XFAIL #835 -- errno should not be touched by Catch
+:test-result: XFAIL #835 -- errno should not be touched by Catch2
:test-result: PASS #872
:test-result: PASS #961 -- Dynamically created sections should all be reported
:test-result: FAIL 'Not' checks that should fail
@@ -375,7 +374,6 @@ loose text artifact
:test-result: PASS tuple<>
:test-result: PASS tuple<float,int>
:test-result: PASS tuple<int>
-:test-result: PASS tuple<0,int,const char *>
:test-result: PASS tuple<string,string>
:test-result: PASS tuple<tuple<int>,tuple<>,float>
:test-result: PASS uniform samples
diff --git a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
index 4b75ed64..31c0b106 100644
--- a/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/automake.sw.multi.approved.txt
@@ -1,5 +1,4 @@
:test-result: PASS # A test name that starts with a #
-:test-result: PASS #1005: Comparing pointer to int and long (NULL can be either on various systems)
:test-result: PASS #1027: Bitfields can be captured
:test-result: PASS #1147
:test-result: PASS #1175 - Hidden Test
@@ -27,7 +26,7 @@
:test-result: XFAIL #748 - captures with unexpected exceptions
:test-result: PASS #809
:test-result: PASS #833
-:test-result: XFAIL #835 -- errno should not be touched by Catch
+:test-result: XFAIL #835 -- errno should not be touched by Catch2
:test-result: PASS #872
:test-result: PASS #961 -- Dynamically created sections should all be reported
:test-result: FAIL 'Not' checks that should fail
@@ -367,7 +366,6 @@
:test-result: PASS tuple<>
:test-result: PASS tuple<float,int>
:test-result: PASS tuple<int>
-:test-result: PASS tuple<0,int,const char *>
:test-result: PASS tuple<string,string>
:test-result: PASS tuple<tuple<int>,tuple<>,float>
:test-result: PASS uniform samples
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
index f921fc2d..20098061 100644
--- a/tests/SelfTest/Baselines/compact.sw.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -1,6 +1,4 @@
Misc.tests.cpp:<line number>: passed: with 1 message: 'yay'
-Decomposition.tests.cpp:<line number>: passed: fptr == 0 for: 0 == 0
-Decomposition.tests.cpp:<line number>: passed: fptr == 0l for: 0 == 0
Compilation.tests.cpp:<line number>: passed: y.v == 0 for: 0 == 0
Compilation.tests.cpp:<line number>: passed: 0 == y.v for: 0 == 0
Compilation.tests.cpp:<line number>: passed: t1 == t2 for: {?} == {?}
@@ -96,7 +94,7 @@ Compilation.tests.cpp:<line number>: passed: throws_int(false)
Compilation.tests.cpp:<line number>: passed: "aaa", Catch::Matchers::EndsWith("aaa") for: "aaa" ends with: "aaa"
Compilation.tests.cpp:<line number>: passed: templated_tests<int>(3) for: true
Misc.tests.cpp:<line number>: failed: f() == 0 for: 1 == 0
-Misc.tests.cpp:<line number>: passed: errno == 1 for: 1 == 1
+Misc.tests.cpp:<line number>: passed: errno_after == 1 for: 1 == 1
Compilation.tests.cpp:<line number>: passed: x == 4 for: {?} == 4 with 1 message: 'dummy := 0'
Misc.tests.cpp:<line number>: passed: with 1 message: 'Everything is OK'
Misc.tests.cpp:<line number>: passed: with 1 message: 'Everything is OK'
@@ -2426,9 +2424,6 @@ ToStringTuple.tests.cpp:<line number>: passed: "{ }" == ::Catch::Detail::stringi
ToStringTuple.tests.cpp:<line number>: passed: "1.2f" == ::Catch::Detail::stringify(float(1.2)) for: "1.2f" == "1.2f"
ToStringTuple.tests.cpp:<line number>: passed: "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0}) for: "{ 1.2f, 0 }" == "{ 1.2f, 0 }"
ToStringTuple.tests.cpp:<line number>: passed: "{ 0 }" == ::Catch::Detail::stringify(type{0}) for: "{ 0 }" == "{ 0 }"
-ToStringTuple.tests.cpp:<line number>: passed: "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) for: "{ 0, 42, "Catch me" }"
-==
-"{ 0, 42, "Catch me" }"
ToStringTuple.tests.cpp:<line number>: passed: "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"}) for: "{ "hello", "world" }"
==
"{ "hello", "world" }"
diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
index ffd0932a..993a7b7c 100644
--- a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -1,6 +1,4 @@
Misc.tests.cpp:<line number>: passed: with 1 message: 'yay'
-Decomposition.tests.cpp:<line number>: passed: fptr == 0 for: 0 == 0
-Decomposition.tests.cpp:<line number>: passed: fptr == 0l for: 0 == 0
Compilation.tests.cpp:<line number>: passed: y.v == 0 for: 0 == 0
Compilation.tests.cpp:<line number>: passed: 0 == y.v for: 0 == 0
Compilation.tests.cpp:<line number>: passed: t1 == t2 for: {?} == {?}
@@ -94,7 +92,7 @@ Compilation.tests.cpp:<line number>: passed: throws_int(false)
Compilation.tests.cpp:<line number>: passed: "aaa", Catch::Matchers::EndsWith("aaa") for: "aaa" ends with: "aaa"
Compilation.tests.cpp:<line number>: passed: templated_tests<int>(3) for: true
Misc.tests.cpp:<line number>: failed: f() == 0 for: 1 == 0
-Misc.tests.cpp:<line number>: passed: errno == 1 for: 1 == 1
+Misc.tests.cpp:<line number>: passed: errno_after == 1 for: 1 == 1
Compilation.tests.cpp:<line number>: passed: x == 4 for: {?} == 4 with 1 message: 'dummy := 0'
Misc.tests.cpp:<line number>: passed: with 1 message: 'Everything is OK'
Misc.tests.cpp:<line number>: passed: with 1 message: 'Everything is OK'
@@ -2418,9 +2416,6 @@ ToStringTuple.tests.cpp:<line number>: passed: "{ }" == ::Catch::Detail::stringi
ToStringTuple.tests.cpp:<line number>: passed: "1.2f" == ::Catch::Detail::stringify(float(1.2)) for: "1.2f" == "1.2f"
ToStringTuple.tests.cpp:<line number>: passed: "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0}) for: "{ 1.2f, 0 }" == "{ 1.2f, 0 }"
ToStringTuple.tests.cpp:<line number>: passed: "{ 0 }" == ::Catch::Detail::stringify(type{0}) for: "{ 0 }" == "{ 0 }"
-ToStringTuple.tests.cpp:<line number>: passed: "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) for: "{ 0, 42, "Catch me" }"
-==
-"{ 0, 42, "Catch me" }"
ToStringTuple.tests.cpp:<line number>: passed: "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"}) for: "{ "hello", "world" }"
==
"{ "hello", "world" }"
diff --git a/tests/SelfTest/Baselines/console.std.approved.txt b/tests/SelfTest/Baselines/console.std.approved.txt
index ca299535..f6f6b292 100644
--- a/tests/SelfTest/Baselines/console.std.approved.txt
+++ b/tests/SelfTest/Baselines/console.std.approved.txt
@@ -54,7 +54,7 @@ due to unexpected exception with messages:
expected exception
-------------------------------------------------------------------------------
-#835 -- errno should not be touched by Catch
+#835 -- errno should not be touched by Catch2
-------------------------------------------------------------------------------
Misc.tests.cpp:<line number>
...............................................................................
@@ -1395,6 +1395,6 @@ due to unexpected exception with message:
Why would you throw a std::string?
===============================================================================
-test cases: 383 | 307 passed | 69 failed | 7 failed as expected
-assertions: 2212 | 2057 passed | 128 failed | 27 failed as expected
+test cases: 381 | 305 passed | 69 failed | 7 failed as expected
+assertions: 2209 | 2054 passed | 128 failed | 27 failed as expected
diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
index 11ee162e..8d1a25b4 100644
--- a/tests/SelfTest/Baselines/console.sw.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -17,23 +17,6 @@ with message:
yay
-------------------------------------------------------------------------------
-#1005: Comparing pointer to int and long (NULL can be either on various
- systems)
--------------------------------------------------------------------------------
-Decomposition.tests.cpp:<line number>
-...............................................................................
-
-Decomposition.tests.cpp:<line number>: PASSED:
- REQUIRE( fptr == 0 )
-with expansion:
- 0 == 0
-
-Decomposition.tests.cpp:<line number>: PASSED:
- REQUIRE( fptr == 0l )
-with expansion:
- 0 == 0
-
--------------------------------------------------------------------------------
#1027: Bitfields can be captured
-------------------------------------------------------------------------------
Compilation.tests.cpp:<line number>
@@ -863,7 +846,7 @@ with expansion:
true
-------------------------------------------------------------------------------
-#835 -- errno should not be touched by Catch
+#835 -- errno should not be touched by Catch2
-------------------------------------------------------------------------------
Misc.tests.cpp:<line number>
...............................................................................
@@ -874,7 +857,7 @@ with expansion:
1 == 0
Misc.tests.cpp:<line number>: PASSED:
- REQUIRE( errno == 1 )
+ REQUIRE( errno_after == 1 )
with expansion:
1 == 1
@@ -17233,19 +17216,6 @@ with expansion:
"{ 0 }" == "{ 0 }"
-------------------------------------------------------------------------------
-tuple<0,int,const char *>
--------------------------------------------------------------------------------
-ToStringTuple.tests.cpp:<line number>
-...............................................................................
-
-ToStringTuple.tests.cpp:<line number>: PASSED:
- CHECK( "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) )
-with expansion:
- "{ 0, 42, "Catch me" }"
- ==
- "{ 0, 42, "Catch me" }"
-
--------------------------------------------------------------------------------
tuple<string,string>
-------------------------------------------------------------------------------
ToStringTuple.tests.cpp:<line number>
@@ -17784,6 +17754,6 @@ Misc.tests.cpp:<line number>
Misc.tests.cpp:<line number>: PASSED:
===============================================================================
-test cases: 383 | 293 passed | 83 failed | 7 failed as expected
-assertions: 2227 | 2057 passed | 143 failed | 27 failed as expected
+test cases: 381 | 291 passed | 83 failed | 7 failed as expected
+assertions: 2224 | 2054 passed | 143 failed | 27 failed as expected
diff --git a/tests/SelfTest/Baselines/console.sw.multi.approved.txt b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
index 9155ad62..920a1c7a 100644
--- a/tests/SelfTest/Baselines/console.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/console.sw.multi.approved.txt
@@ -17,23 +17,6 @@ with message:
yay
-------------------------------------------------------------------------------
-#1005: Comparing pointer to int and long (NULL can be either on various
- systems)
--------------------------------------------------------------------------------
-Decomposition.tests.cpp:<line number>
-...............................................................................
-
-Decomposition.tests.cpp:<line number>: PASSED:
- REQUIRE( fptr == 0 )
-with expansion:
- 0 == 0
-
-Decomposition.tests.cpp:<line number>: PASSED:
- REQUIRE( fptr == 0l )
-with expansion:
- 0 == 0
-
--------------------------------------------------------------------------------
#1027: Bitfields can be captured
-------------------------------------------------------------------------------
Compilation.tests.cpp:<line number>
@@ -861,7 +844,7 @@ with expansion:
true
-------------------------------------------------------------------------------
-#835 -- errno should not be touched by Catch
+#835 -- errno should not be touched by Catch2
-------------------------------------------------------------------------------
Misc.tests.cpp:<line number>
...............................................................................
@@ -872,7 +855,7 @@ with expansion:
1 == 0
Misc.tests.cpp:<line number>: PASSED:
- REQUIRE( errno == 1 )
+ REQUIRE( errno_after == 1 )
with expansion:
1 == 1
@@ -17225,19 +17208,6 @@ with expansion:
"{ 0 }" == "{ 0 }"
-------------------------------------------------------------------------------
-tuple<0,int,const char *>
--------------------------------------------------------------------------------
-ToStringTuple.tests.cpp:<line number>
-...............................................................................
-
-ToStringTuple.tests.cpp:<line number>: PASSED:
- CHECK( "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) )
-with expansion:
- "{ 0, 42, "Catch me" }"
- ==
- "{ 0, 42, "Catch me" }"
-
--------------------------------------------------------------------------------
tuple<string,string>
-------------------------------------------------------------------------------
ToStringTuple.tests.cpp:<line number>
@@ -17776,6 +17746,6 @@ Misc.tests.cpp:<line number>
Misc.tests.cpp:<line number>: PASSED:
===============================================================================
-test cases: 383 | 293 passed | 83 failed | 7 failed as expected
-assertions: 2227 | 2057 passed | 143 failed | 27 failed as expected
+test cases: 381 | 291 passed | 83 failed | 7 failed as expected
+assertions: 2224 | 2054 passed | 143 failed | 27 failed as expected
diff --git a/tests/SelfTest/Baselines/console.swa4.approved.txt b/tests/SelfTest/Baselines/console.swa4.approved.txt
index df003bd3..8b4b4c13 100644
--- a/tests/SelfTest/Baselines/console.swa4.approved.txt
+++ b/tests/SelfTest/Baselines/console.swa4.approved.txt
@@ -17,23 +17,6 @@ with message:
yay
-------------------------------------------------------------------------------
-#1005: Comparing pointer to int and long (NULL can be either on various
- systems)
--------------------------------------------------------------------------------
-Decomposition.tests.cpp:<line number>
-...............................................................................
-
-Decomposition.tests.cpp:<line number>: PASSED:
- REQUIRE( fptr == 0 )
-with expansion:
- 0 == 0
-
-Decomposition.tests.cpp:<line number>: PASSED:
- REQUIRE( fptr == 0l )
-with expansion:
- 0 == 0
-
--------------------------------------------------------------------------------
#1027: Bitfields can be captured
-------------------------------------------------------------------------------
Compilation.tests.cpp:<line number>
@@ -863,7 +846,7 @@ with expansion:
true
-------------------------------------------------------------------------------
-#835 -- errno should not be touched by Catch
+#835 -- errno should not be touched by Catch2
-------------------------------------------------------------------------------
Misc.tests.cpp:<line number>
...............................................................................
@@ -874,7 +857,7 @@ with expansion:
1 == 0
Misc.tests.cpp:<line number>: PASSED:
- REQUIRE( errno == 1 )
+ REQUIRE( errno_after == 1 )
with expansion:
1 == 1
@@ -959,6 +942,6 @@ Condition.tests.cpp:<line number>: FAILED:
CHECK( true != true )
===============================================================================
-test cases: 33 | 28 passed | 3 failed | 2 failed as expected
-assertions: 103 | 96 passed | 4 failed | 3 failed as expected
+test cases: 32 | 27 passed | 3 failed | 2 failed as expected
+assertions: 101 | 94 passed | 4 failed | 3 failed as expected
diff --git a/tests/SelfTest/Baselines/junit.sw.approved.txt b/tests/SelfTest/Baselines/junit.sw.approved.txt
index 459b77ed..c020fa4b 100644
--- a/tests/SelfTest/Baselines/junit.sw.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,13 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuitesloose text artifact
>
- <testsuite name="<exe-name>" errors="17" failures="126" tests="2227" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+ <testsuite name="<exe-name>" errors="17" failures="126" tests="2224" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<properties>
<property name="random-seed" value="1"/>
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
</properties>
<testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#1027: Bitfields can be captured" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#1147" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#1175 - Hidden Test" time="{duration}" status="run"/>
@@ -71,7 +70,7 @@ Exception.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/inside REQUIRE_THROWS" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#809" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#833" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="#835 -- errno should not be touched by Catch" time="{duration}" status="run">
+ <testcase classname="<exe-name>.global" name="#835 -- errno should not be touched by Catch2" time="{duration}" status="run">
<skipped message="TEST_CASE tagged with !mayfail"/>
<failure message="f() == 0" type="CHECK">
FAILED:
@@ -1866,7 +1865,6 @@ Exception.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="tuple&lt;>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;float,int>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;int>" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="tuple&lt;0,int,const char *>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;string,string>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="uniform samples" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
index 8f8eccf2..91398339 100644
--- a/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/junit.sw.multi.approved.txt
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuites>
- <testsuite name="<exe-name>" errors="17" failures="126" tests="2227" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+ <testsuite name="<exe-name>" errors="17" failures="126" tests="2224" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<properties>
<property name="random-seed" value="1"/>
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
</properties>
<testcase classname="<exe-name>.global" name="# A test name that starts with a #" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#1027: Bitfields can be captured" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#1147" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#1175 - Hidden Test" time="{duration}" status="run"/>
@@ -70,7 +69,7 @@ Exception.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="#748 - captures with unexpected exceptions/inside REQUIRE_THROWS" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#809" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="#833" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="#835 -- errno should not be touched by Catch" time="{duration}" status="run">
+ <testcase classname="<exe-name>.global" name="#835 -- errno should not be touched by Catch2" time="{duration}" status="run">
<skipped message="TEST_CASE tagged with !mayfail"/>
<failure message="f() == 0" type="CHECK">
FAILED:
@@ -1865,7 +1864,6 @@ Exception.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="tuple&lt;>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;float,int>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;int>" time="{duration}" status="run"/>
- <testcase classname="<exe-name>.global" name="tuple&lt;0,int,const char *>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;string,string>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" time="{duration}" status="run"/>
<testcase classname="<exe-name>.global" name="uniform samples" time="{duration}" status="run"/>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
index e597f41a..cc901e29 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -865,7 +865,6 @@ Condition.tests.cpp:<line number>
<testCase name="comparisons between int variables" duration="{duration}"/>
</file>
<file path="tests/<exe-name>/UsageTests/Decomposition.tests.cpp">
- <testCase name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" duration="{duration}"/>
<testCase name="Reconstruction should be based on stringification: #914" duration="{duration}">
<failure message="CHECK(truthy(false))">
FAILED:
@@ -1553,7 +1552,7 @@ Message.tests.cpp:<line number>
<testCase name="#1954 - 7 arg template test case sig compiles - 1, 1, 1, 1, 1, 0, 0" duration="{duration}"/>
<testCase name="#1954 - 7 arg template test case sig compiles - 5, 1, 1, 1, 1, 0, 0" duration="{duration}"/>
<testCase name="#1954 - 7 arg template test case sig compiles - 5, 3, 1, 1, 1, 0, 0" duration="{duration}"/>
- <testCase name="#835 -- errno should not be touched by Catch" duration="{duration}">
+ <testCase name="#835 -- errno should not be touched by Catch2" duration="{duration}">
<skipped message="CHECK(f() == 0)">
FAILED:
CHECK( f() == 0 )
@@ -1847,7 +1846,6 @@ Misc.tests.cpp:<line number>
<testCase name="tuple&lt;>" duration="{duration}"/>
<testCase name="tuple&lt;float,int>" duration="{duration}"/>
<testCase name="tuple&lt;int>" duration="{duration}"/>
- <testCase name="tuple&lt;0,int,const char *>" duration="{duration}"/>
<testCase name="tuple&lt;string,string>" duration="{duration}"/>
<testCase name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" duration="{duration}"/>
</file>
diff --git a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
index 9637e8a1..0359fa40 100644
--- a/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
+++ b/tests/SelfTest/Baselines/sonarqube.sw.multi.approved.txt
@@ -864,7 +864,6 @@ Condition.tests.cpp:<line number>
<testCase name="comparisons between int variables" duration="{duration}"/>
</file>
<file path="tests/<exe-name>/UsageTests/Decomposition.tests.cpp">
- <testCase name="#1005: Comparing pointer to int and long (NULL can be either on various systems)" duration="{duration}"/>
<testCase name="Reconstruction should be based on stringification: #914" duration="{duration}">
<failure message="CHECK(truthy(false))">
FAILED:
@@ -1552,7 +1551,7 @@ Message.tests.cpp:<line number>
<testCase name="#1954 - 7 arg template test case sig compiles - 1, 1, 1, 1, 1, 0, 0" duration="{duration}"/>
<testCase name="#1954 - 7 arg template test case sig compiles - 5, 1, 1, 1, 1, 0, 0" duration="{duration}"/>
<testCase name="#1954 - 7 arg template test case sig compiles - 5, 3, 1, 1, 1, 0, 0" duration="{duration}"/>
- <testCase name="#835 -- errno should not be touched by Catch" duration="{duration}">
+ <testCase name="#835 -- errno should not be touched by Catch2" duration="{duration}">
<skipped message="CHECK(f() == 0)">
FAILED:
CHECK( f() == 0 )
@@ -1846,7 +1845,6 @@ Misc.tests.cpp:<line number>
<testCase name="tuple&lt;>" duration="{duration}"/>
<testCase name="tuple&lt;float,int>" duration="{duration}"/>
<testCase name="tuple&lt;int>" duration="{duration}"/>
- <testCase name="tuple&lt;0,int,const char *>" duration="{duration}"/>
<testCase name="tuple&lt;string,string>" duration="{duration}"/>
<testCase name="tuple&lt;tuple&lt;int>,tuple&lt;>,float>" duration="{duration}"/>
</file>
diff --git a/tests/SelfTest/Baselines/tap.sw.approved.txt b/tests/SelfTest/Baselines/tap.sw.approved.txt
index 6306f579..bd0e9881 100644
--- a/tests/SelfTest/Baselines/tap.sw.approved.txt
+++ b/tests/SelfTest/Baselines/tap.sw.approved.txt
@@ -1,9 +1,5 @@
# # A test name that starts with a #
ok {test-number} - with 1 message: 'yay'
-# #1005: Comparing pointer to int and long (NULL can be either on various systems)
-ok {test-number} - fptr == 0 for: 0 == 0
-# #1005: Comparing pointer to int and long (NULL can be either on various systems)
-ok {test-number} - fptr == 0l for: 0 == 0
# #1027: Bitfields can be captured
ok {test-number} - y.v == 0 for: 0 == 0
# #1027: Bitfields can be captured
@@ -188,10 +184,10 @@ ok {test-number} - throws_int(false)
ok {test-number} - "aaa", Catch::Matchers::EndsWith("aaa") for: "aaa" ends with: "aaa"
# #833
ok {test-number} - templated_tests<int>(3) for: true
-# #835 -- errno should not be touched by Catch
+# #835 -- errno should not be touched by Catch2
not ok {test-number} - f() == 0 for: 1 == 0
-# #835 -- errno should not be touched by Catch
-ok {test-number} - errno == 1 for: 1 == 1
+# #835 -- errno should not be touched by Catch2
+ok {test-number} - errno_after == 1 for: 1 == 1
# #872
ok {test-number} - x == 4 for: {?} == 4 with 1 message: 'dummy := 0'
# #961 -- Dynamically created sections should all be reported
@@ -4320,8 +4316,6 @@ ok {test-number} - "1.2f" == ::Catch::Detail::stringify(float(1.2)) for: "1.2f"
ok {test-number} - "{ 1.2f, 0 }" == ::Catch::Detail::stringify(type{1.2f,0}) for: "{ 1.2f, 0 }" == "{ 1.2f, 0 }"
# tuple<int>
ok {test-number} - "{ 0 }" == ::Catch::Detail::stringify(type{0}) for: "{ 0 }" == "{ 0 }"
-# tuple<0,int,const char *>
-ok {test-number} - "{ 0, 42, \"Catch me\" }" == ::Catch::Detail::stringify(value) for: "{ 0, 42, "Catch me" }" == "{ 0, 42, "Catch me" }"
# tuple<string,string>
ok {test-number} - "{ \"hello\", \"world\" }" == ::Catch::Detail::stringify(type{"hello","world"}) for: "{ "hello", "world" }" == "{ "hello", "world" }"
# tuple<tuple<int>,tuple<>,float>
@@ -4456,5 +4450,5 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
ok {test-number} -
# xmlentitycheck
ok {test-number} -
-1..2227
+1..2224
diff --git a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt b/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
index c6b4a8bd..59e8d1a8 100644
--- a/tests/SelfTest/Baselines/tap.sw.multi.approved.txt
+++ b/