Skip to content

Commit e91c431

Browse files
Riyuzak2510Riyuzak2510
committed
Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE
1 parent 33e047a commit e91c431

12 files changed

+57
-6
lines changed

‎tests/SelfTest/Baselines/compact.sw.approved.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2889,7 +2889,12 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
28892889
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
28902890
Misc.tests.cpp:<line number>: passed:
28912891
Misc.tests.cpp:<line number>: passed:
2892+
<<<<<<< HEAD
28922893
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
28932894
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
2895+
=======
2896+
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
2897+
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
2898+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
28942899

28952900

‎tests/SelfTest/Baselines/compact.sw.multi.approved.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2878,7 +2878,12 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
28782878
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
28792879
Misc.tests.cpp:<line number>: passed:
28802880
Misc.tests.cpp:<line number>: passed:
2881+
<<<<<<< HEAD
28812882
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
28822883
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
2884+
=======
2885+
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
2886+
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
2887+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
28832888

28842889

‎tests/SelfTest/Baselines/console.std.approved.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1752,6 +1752,11 @@ due to unexpected exception with message:
17521752
Why would you throw a std::string?
17531753

17541754
===============================================================================
1755+
<<<<<<< HEAD
17551756
test cases: 439 | 337 passed | 78 failed | 7 skipped | 17 failed as expected
17561757
assertions: 2283 | 2103 passed | 139 failed | 41 failed as expected
1758+
=======
1759+
test cases: 438 | 336 passed | 78 failed | 7 skipped | 17 failed as expected
1760+
assertions: 2276 | 2096 passed | 139 failed | 41 failed as expected
1761+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
17571762

‎tests/SelfTest/Baselines/console.sw.approved.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19337,6 +19337,11 @@ Misc.tests.cpp:<line number>
1933719337
Misc.tests.cpp:<line number>: PASSED:
1933819338

1933919339
===============================================================================
19340+
<<<<<<< HEAD
1934019341
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
1934119342
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
19343+
=======
19344+
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
19345+
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
19346+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
1934219347

‎tests/SelfTest/Baselines/console.sw.multi.approved.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19326,6 +19326,11 @@ Misc.tests.cpp:<line number>
1932619326
Misc.tests.cpp:<line number>: PASSED:
1932719327

1932819328
===============================================================================
19329+
<<<<<<< HEAD
1932919330
test cases: 439 | 319 passed | 97 failed | 6 skipped | 17 failed as expected
1933019331
assertions: 2304 | 2103 passed | 160 failed | 41 failed as expected
19332+
=======
19333+
test cases: 438 | 318 passed | 97 failed | 6 skipped | 17 failed as expected
19334+
assertions: 2297 | 2096 passed | 160 failed | 41 failed as expected
19335+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
1933119336

‎tests/SelfTest/Baselines/junit.sw.approved.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<testsuitesloose text artifact
33
>
4+
<<<<<<< HEAD
45
<testsuite name="<exe-name>" errors="17" failures="143" skipped="12" tests="2316" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
6+
=======
7+
<testsuite name="<exe-name>" errors="17" failures="143" skipped="12" tests="2309" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
8+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
59
<properties>
610
<property name="random-seed" value="1"/>
711
<property name="filters" value="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]"/>

‎tests/SelfTest/Baselines/junit.sw.multi.approved.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<testsuites>
3+
<<<<<<< HEAD
34
<testsuite name="<exe-name>" errors="17" failures="143" skipped="12" tests="2316" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
5+
=======
6+
<testsuite name="<exe-name>" errors="17" failures="143" skipped="12" tests="2309" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
7+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
48
<properties>
59
<property name="random-seed" value="1"/>
610
<property name="filters" value="&quot;*&quot; ~[!nonportable] ~[!benchmark] ~[approvals]"/>

‎tests/SelfTest/Baselines/tap.sw.approved.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4629,5 +4629,9 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
46294629
ok {test-number} -
46304630
# xmlentitycheck
46314631
ok {test-number} -
4632+
<<<<<<< HEAD
46324633
1..2316
4634+
=======
4635+
1..2309
4636+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
46334637

‎tests/SelfTest/Baselines/tap.sw.multi.approved.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4618,5 +4618,9 @@ ok {test-number} - q3 == 23. for: 23.0 == 23.0
46184618
ok {test-number} -
46194619
# xmlentitycheck
46204620
ok {test-number} -
4621+
<<<<<<< HEAD
46214622
1..2316
4623+
=======
4624+
1..2309
4625+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
46224626

‎tests/SelfTest/Baselines/xml.sw.approved.txt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21080,7 +21080,7 @@ Approx( -1.95996398454005449 )
2108021080
</Expression>
2108121081
<OverallResult success="true" skips="0"/>
2108221082
</TestCase>
21083-
<TestCase name="stacks unscoped capture for vector" tags="[capture][failing][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
21083+
<TestCase name="stacks unscoped capture for vector" tags="[.][capture][failing][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
2108421084
<Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
2108521085
input := { 7, 8, 9 }
2108621086
</Info>
@@ -21094,7 +21094,7 @@ Approx( -1.95996398454005449 )
2109421094
</Expression>
2109521095
<OverallResult success="false" skips="0"/>
2109621096
</TestCase>
21097-
<TestCase name="stacks unscoped capture in loops" tags="[capture][failing][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
21097+
<TestCase name="stacks unscoped capture in loops" tags="[.][capture][failing][unscoped]" filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
2109821098
<Info filename="tests/<exe-name>/UsageTests/Message.tests.cpp" >
2109921099
"Count 1 to 3..." := "Count 1 to 3..."
2110021100
</Info>
@@ -22403,6 +22403,11 @@ Approx( -1.95996398454005449 )
2240322403
</Section>
2240422404
<OverallResult success="true" skips="0"/>
2240522405
</TestCase>
22406+
<<<<<<< HEAD
2240622407
<OverallResults successes="2103" failures="160" expectedFailures="41" skips="12"/>
2240722408
<OverallResultsCases successes="319" failures="97" expectedFailures="17" skips="6"/>
22409+
=======
22410+
<OverallResults successes="2096" failures="160" expectedFailures="41" skips="12"/>
22411+
<OverallResultsCases successes="318" failures="97" expectedFailures="17" skips="6"/>
22412+
>>>>>>> abfdfcf0 (Editing Baseline Files to Accomodate tests for UNSCOPED CAPTURE)
2240822413
</Catch2TestRun>

0 commit comments

Comments
 (0)