Try fix for old GCC versions

catchorg · Nov 14, 2023 · ff586de · ff586de
1 parent 1c41509
commit ff586de
Show file tree

Hide file tree

Showing 9 changed files with 162 additions and 162 deletions.
diff --git a/tests/SelfTest/Baselines/compact.sw.approved.txt b/tests/SelfTest/Baselines/compact.sw.approved.txt
@@ -979,22 +979,22 @@ Condition.tests.cpp:<line number>: passed: data.str_hello != "goodbye" for: "hel
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hell" for: "hello" != "hell"
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hello1" for: "hello" != "hello1"
 Condition.tests.cpp:<line number>: passed: data.str_hello.size() != 6 for: 5 != 6
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-)json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+)" for: "
 "
 ==
 "
 "
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -1005,7 +1005,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     1,
     2
   ]
-})json" for: "
+})" for: "
 {
   "int": 1,
   "double": 1.5,
@@ -1030,14 +1030,14 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     2
   ]
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" for: "
+})" for: "
 {
   "empty_object": {
   },
@@ -1054,16 +1054,16 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "key": 1
   }
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
   1,
   1.5,
@@ -1077,7 +1077,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "array",
     42.5
   ]
-])json" for: "
+])" for: "
 [
   1,
   1.5,
@@ -1108,26 +1108,26 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     42.5
   ]
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-"custom")json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+"custom")" for: "
 "custom""
 ==
 "

diff --git a/tests/SelfTest/Baselines/compact.sw.multi.approved.txt b/tests/SelfTest/Baselines/compact.sw.multi.approved.txt
@@ -977,22 +977,22 @@ Condition.tests.cpp:<line number>: passed: data.str_hello != "goodbye" for: "hel
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hell" for: "hello" != "hell"
 Condition.tests.cpp:<line number>: passed: data.str_hello != "hello1" for: "hello" != "hello1"
 Condition.tests.cpp:<line number>: passed: data.str_hello.size() != 6 for: 5 != 6
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-)json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+)" for: "
 "
 ==
 "
 "
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -1003,7 +1003,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     1,
     2
   ]
-})json" for: "
+})" for: "
 {
   "int": 1,
   "double": 1.5,
@@ -1028,14 +1028,14 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     2
   ]
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" for: "
+})" for: "
 {
   "empty_object": {
   },
@@ -1052,16 +1052,16 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "key": 1
   }
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
   1,
   1.5,
@@ -1075,7 +1075,7 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     "array",
     42.5
   ]
-])json" for: "
+])" for: "
 [
   1,
   1.5,
@@ -1106,26 +1106,26 @@ Json.tests.cpp:<line number>: passed: stream.str() == R"json(
     42.5
   ]
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 {
-})json" for: "
+})" for: "
 {
 }"
 ==
 "
 {
 }"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
 [
-])json" for: "
+])" for: "
 [
 ]"
 ==
 "
 [
 ]"
-Json.tests.cpp:<line number>: passed: stream.str() == R"json(
-"custom")json" for: "
+Json.tests.cpp:<line number>: passed: stream.str() == R"(
+"custom")" for: "
 "custom""
 ==
 "

diff --git a/tests/SelfTest/Baselines/console.sw.approved.txt b/tests/SelfTest/Baselines/console.sw.approved.txt
@@ -7266,8 +7266,8 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
-)json" )
+  REQUIRE( stream.str() == R"(
+)" )
 with expansion:
   "
   "
@@ -7283,9 +7283,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7303,7 +7303,7 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
   "int": 1,
   "double": 1.5,
@@ -7314,7 +7314,7 @@ Json.tests.cpp:<line number>: PASSED:
     1,
     2
   ]
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7350,14 +7350,14 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
   "empty_object": {
   },
   "fully_object": {
     "key": 1
   }
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7385,9 +7385,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7405,7 +7405,7 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
   1,
   1.5,
@@ -7419,7 +7419,7 @@ Json.tests.cpp:<line number>: PASSED:
     "array",
     42.5
   ]
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7461,9 +7461,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 {
-})json" )
+})" )
 with expansion:
   "
   {
@@ -7481,9 +7481,9 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
+  REQUIRE( stream.str() == R"(
 [
-])json" )
+])" )
 with expansion:
   "
   [
@@ -7501,8 +7501,8 @@ Json.tests.cpp:<line number>
 ...............................................................................
 
 Json.tests.cpp:<line number>: PASSED:
-  REQUIRE( stream.str() == R"json(
-"custom")json" )
+  REQUIRE( stream.str() == R"(
+"custom")" )
 with expansion:
   "
   "custom""