Updated approval tests
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index e6bcf41..0ad362e 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -368,7 +368,9 @@
CHECK( a == 0 )
with expansion:
2 == 0
-with message:
+with messages:
+ this message may be logged later
+ this message should be logged
and this, but later
-------------------------------------------------------------------------------
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index ac178f8..c1d8865 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -119,7 +119,7 @@
MiscTests.cpp:<line number>:
PASSED:
- REQUIRE( (*__error()) == 1 )
+ REQUIRE( errno == 1 )
with expansion:
1 == 1
@@ -2717,14 +2717,17 @@
CHECK( a == 1 )
with expansion:
2 == 1
-with message:
+with messages:
+ this message may be logged later
this message should be logged
MessageTests.cpp:<line number>: FAILED:
CHECK( a == 0 )
with expansion:
2 == 0
-with message:
+with messages:
+ this message may be logged later
+ this message should be logged
and this, but later
MessageTests.cpp:<line number>:
@@ -2732,7 +2735,10 @@
CHECK( a == 2 )
with expansion:
2 == 2
-with message:
+with messages:
+ this message may be logged later
+ this message should be logged
+ and this, but later
but not this
-------------------------------------------------------------------------------
diff --git a/projects/SelfTest/Baselines/console.swa4.approved.txt b/projects/SelfTest/Baselines/console.swa4.approved.txt
index dcabf4e..a23a6ab 100644
--- a/projects/SelfTest/Baselines/console.swa4.approved.txt
+++ b/projects/SelfTest/Baselines/console.swa4.approved.txt
@@ -119,7 +119,7 @@
MiscTests.cpp:<line number>:
PASSED:
- REQUIRE( (*__error()) == 1 )
+ REQUIRE( errno == 1 )
with expansion:
1 == 1
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 49df947..6237fb6 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -237,10 +237,13 @@
</testcase>
<testcase classname="global" name="INFO gets logged on failure, even if captured before successful assertions" time="{duration}">
<failure message="2 == 1" type="CHECK">
+this message may be logged later
this message should be logged
MessageTests.cpp:<line number>
</failure>
<failure message="2 == 0" type="CHECK">
+this message may be logged later
+this message should be logged
and this, but later
MessageTests.cpp:<line number>
</failure>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index fed55cd..83d9a42 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -128,7 +128,7 @@
</Expression>
<Expression success="true" type="REQUIRE" filename="projects/<exe-name>/MiscTests.cpp" >
<Original>
- (*__error()) == 1
+ errno == 1
</Original>
<Expanded>
1 == 1
@@ -2745,6 +2745,9 @@
</Expanded>
</Expression>
<Info>
+ this message may be logged later
+ </Info>
+ <Info>
this message should be logged
</Info>
<Expression success="false" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
@@ -2756,6 +2759,12 @@
</Expanded>
</Expression>
<Info>
+ this message may be logged later
+ </Info>
+ <Info>
+ this message should be logged
+ </Info>
+ <Info>
and this, but later
</Info>
<Expression success="false" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >
@@ -2767,6 +2776,15 @@
</Expanded>
</Expression>
<Info>
+ this message may be logged later
+ </Info>
+ <Info>
+ this message should be logged
+ </Info>
+ <Info>
+ and this, but later
+ </Info>
+ <Info>
but not this
</Info>
<Expression success="true" type="CHECK" filename="projects/<exe-name>/MessageTests.cpp" >