Skip to content

Commit 60cb3d3

Browse files
author
Clément Metz
committed
Fixed CI
1 parent 1eb0ce4 commit 60cb3d3

19 files changed

Lines changed: 72 additions & 52 deletions

‎src/catch2/internal/catch_constexpr_asserts.hpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,7 @@ namespace Catch {
1919
ExpressionType decomposedExpression ) {
2020
AssertionHandler catchAssertionHandler(
2121
macroName, lineInfo, capturedExpression, resultDisposition );
22-
CATCH_TRY {
23-
catchAssertionHandler.handleExpr( decomposedExpression );
24-
} CATCH_CATCH_ALL {
25-
catchAssertionHandler.handleUnexpectedInflightException();
26-
}
22+
catchAssertionHandler.handleExpr( decomposedExpression );
2723
catchAssertionHandler.complete();
2824
}
2925
} // namespace Catch

‎src/catch2/internal/catch_constexpr_section.cpp‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@
1010
#include <catch2/internal/catch_constexpr_section.hpp>
1111

1212
namespace Catch {
13-
void ConstexprSection::addFakeAssertion( const char* file,
14-
size_t lineNumber ) {
13+
void ConstexprSection::addFakeAssertion() {
1514
AssertionHandler catchAssertionHandler(
1615
"CONSTEXPR_SECTION",
17-
SourceLineInfo( file, lineNumber ),
16+
SourceLineInfo( "unknown-file", 0 ),
1817
"[Passed during compilation]",
1918
ResultDisposition::Normal );
2019
catchAssertionHandler.handleMessage( ResultWas::Ok,

‎src/catch2/internal/catch_constexpr_section.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@ namespace Catch {
3030
return true;
3131
}(),
3232
"compile time section error" );
33-
addFakeAssertion( "unknown-file", 0 );
33+
addFakeAssertion();
3434
callable();
3535
}
3636

3737
// Add a fake assertion to the section to avoid failures because the
3838
// section is empty
39-
static void addFakeAssertion( const char* file, size_t lineNumber );
39+
static void addFakeAssertion();
4040
};
4141
} // namespace Catch
4242

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ Nor would this
104104
:test-result: PASS CAPTURE can deal with complex expressions
105105
:test-result: PASS CAPTURE can deal with complex expressions involving commas
106106
:test-result: PASS CAPTURE parses string and character constants
107-
:test-result: FAIL CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE should evaluate the expression only once at runtime in case of failure
107+
:test-result: XFAIL CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE should evaluate the expression only once at runtime in case of failure
108108
:test-result: PASS CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE should evaluate the expression only once at runtime in case of success
109109
:test-result: PASS CONSTEXPR_SECTION, CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE behavior during compilation
110110
:test-result: PASS Capture and info messages

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
:test-result: PASS CAPTURE can deal with complex expressions
103103
:test-result: PASS CAPTURE can deal with complex expressions involving commas
104104
:test-result: PASS CAPTURE parses string and character constants
105-
:test-result: FAIL CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE should evaluate the expression only once at runtime in case of failure
105+
:test-result: XFAIL CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE should evaluate the expression only once at runtime in case of failure
106106
:test-result: PASS CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE should evaluate the expression only once at runtime in case of success
107107
:test-result: PASS CONSTEXPR_SECTION, CONSTEXPR_REQUIRE, CONSTEXPR_REQUIRE_FALSE behavior during compilation
108108
:test-result: PASS Capture and info messages

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2901,7 +2901,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
29012901
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
29022902
Misc.tests.cpp:<line number>: passed:
29032903
Misc.tests.cpp:<line number>: passed:
2904-
test cases: 439 | 320 passed | 96 failed | 6 skipped | 17 failed as expected
2905-
assertions: 2316 | 2116 passed | 159 failed | 41 failed as expected
2904+
test cases: 439 | 320 passed | 95 failed | 6 skipped | 18 failed as expected
2905+
assertions: 2316 | 2116 passed | 157 failed | 43 failed as expected
29062906

29072907

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2890,7 +2890,7 @@ InternalBenchmark.tests.cpp:<line number>: passed: med == 18. for: 18.0 == 18.0
28902890
InternalBenchmark.tests.cpp:<line number>: passed: q3 == 23. for: 23.0 == 23.0
28912891
Misc.tests.cpp:<line number>: passed:
28922892
Misc.tests.cpp:<line number>: passed:
2893-
test cases: 439 | 320 passed | 96 failed | 6 skipped | 17 failed as expected
2894-
assertions: 2316 | 2116 passed | 159 failed | 41 failed as expected
2893+
test cases: 439 | 320 passed | 95 failed | 6 skipped | 18 failed as expected
2894+
assertions: 2316 | 2116 passed | 157 failed | 43 failed as expected
28952895

28962896

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1745,6 +1745,6 @@ due to unexpected exception with message:
17451745
Why would you throw a std::string?
17461746

17471747
===============================================================================
1748-
test cases: 439 | 338 passed | 77 failed | 7 skipped | 17 failed as expected
1749-
assertions: 2295 | 2116 passed | 138 failed | 41 failed as expected
1748+
test cases: 439 | 338 passed | 76 failed | 7 skipped | 18 failed as expected
1749+
assertions: 2295 | 2116 passed | 136 failed | 43 failed as expected
17501750

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19441,6 +19441,6 @@ Misc.tests.cpp:<line number>
1944119441
Misc.tests.cpp:<line number>: PASSED:
1944219442

1944319443
===============================================================================
19444-
test cases: 439 | 320 passed | 96 failed | 6 skipped | 17 failed as expected
19445-
assertions: 2316 | 2116 passed | 159 failed | 41 failed as expected
19444+
test cases: 439 | 320 passed | 95 failed | 6 skipped | 18 failed as expected
19445+
assertions: 2316 | 2116 passed | 157 failed | 43 failed as expected
1944619446

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19430,6 +19430,6 @@ Misc.tests.cpp:<line number>
1943019430
Misc.tests.cpp:<line number>: PASSED:
1943119431

1943219432
===============================================================================
19433-
test cases: 439 | 320 passed | 96 failed | 6 skipped | 17 failed as expected
19434-
assertions: 2316 | 2116 passed | 159 failed | 41 failed as expected
19433+
test cases: 439 | 320 passed | 95 failed | 6 skipped | 18 failed as expected
19434+
assertions: 2316 | 2116 passed | 157 failed | 43 failed as expected
1943519435

0 commit comments

Comments
 (0)