3rd-party/catch2
1
0
Fork 0
mirror of https://github.com/catchorg/Catch2.git synced 2024-11-22 21:36:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Force flush streams in tests for #1514

Browse Source 
This avoids the problem where writes to stderr/stdout stop being
line-buffered when stderr/stdout is redirected to a file, which led
to different order of outputs between Linux and Windows in our tests.
This commit is contained in:
Martin Hořeňovský 2019-03-06 21:53:17 +01:00
parent bd667f4d69
commit 1a03918455
No known key found for this signature in database
GPG Key ID: DE48307B8B0D381A
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
projects/SelfTest/Baselines/compact.sw.approved.txt
View File

@ -14,8 +14,8 @@ Compilation.tests.cpp:<line number>: passed: std::memcmp(uarr, "123", sizeof(uar
Compilation.tests.cpp:<line number>: passed: std::memcmp(sarr, "456", sizeof(sarr)) == 0 for: 0 == 0 with 2 messages: 'uarr := "123"' and 'sarr := "456"' Compilation.tests.cpp:<line number>: passed: std::memcmp(sarr, "456", sizeof(sarr)) == 0 for: 0 == 0 with 2 messages: 'uarr := "123"' and 'sarr := "456"'
Compilation.tests.cpp:<line number>: passed: Compilation.tests.cpp:<line number>: passed:
Compilation.tests.cpp:<line number>: passed: h1 == h2 for: [1403 helper] == [1403 helper] Compilation.tests.cpp:<line number>: passed: h1 == h2 for: [1403 helper] == [1403 helper]
Nor would this
This would not be caught previously This would not be caught previously
Nor would this
Tricky.tests.cpp:<line number>: failed: explicitly with 1 message: '1514' Tricky.tests.cpp:<line number>: failed: explicitly with 1 message: '1514'
Compilation.tests.cpp:<line number>: passed: std::is_same<TypeList<int>, TypeList<int>>::value for: true Compilation.tests.cpp:<line number>: passed: std::is_same<TypeList<int>, TypeList<int>>::value for: true
Exception.tests.cpp:<line number>: failed: unexpected exception with message: 'answer := 42' with 1 message: 'expected exception' Exception.tests.cpp:<line number>: failed: unexpected exception with message: 'answer := 42' with 1 message: 'expected exception'

2
projects/SelfTest/Baselines/console.std.approved.txt
View File

@ -1,5 +1,5 @@
Nor would this
This would not be caught previously This would not be caught previously
Nor would this
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
<exe-name> is a <version> host application. <exe-name> is a <version> host application.

2
projects/SelfTest/Baselines/console.sw.approved.txt
View File

@ -133,8 +133,8 @@ Compilation.tests.cpp:<line number>: PASSED:
with expansion: with expansion:
[1403 helper] == [1403 helper] [1403 helper] == [1403 helper]
Nor would this
This would not be caught previously This would not be caught previously
Nor would this
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
#1514: stderr/stdout is not captured in tests aborted by an exception #1514: stderr/stdout is not captured in tests aborted by an exception
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

2
projects/SelfTest/Baselines/console.swa4.approved.txt
View File

@ -133,8 +133,8 @@ Compilation.tests.cpp:<line number>: PASSED:
with expansion: with expansion:
[1403 helper] == [1403 helper] [1403 helper] == [1403 helper]
Nor would this
This would not be caught previously This would not be caught previously
Nor would this
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
#1514: stderr/stdout is not captured in tests aborted by an exception #1514: stderr/stdout is not captured in tests aborted by an exception
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

4
projects/SelfTest/UsageTests/Tricky.tests.cpp
View File

@ -429,8 +429,8 @@ TEST_CASE( "Bitfields can be captured (#1027)" ) {
} }
TEST_CASE("#1514: stderr/stdout is not captured in tests aborted by an exception", "[output-capture][regression][.]") { TEST_CASE("#1514: stderr/stdout is not captured in tests aborted by an exception", "[output-capture][regression][.]") {
std::cout << "This would not be caught previously\n"; std::cout << "This would not be caught previously\n" << std::flush;
std::clog << "Nor would this\n"; std::clog << "Nor would this\n" << std::flush;
// FAIL aborts the test by throwing a Catch exception // FAIL aborts the test by throwing a Catch exception
FAIL("1514"); FAIL("1514");
} }