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

Support '-' as output path for stdout

Browse Source
This commit is contained in:
Martin Hořeňovský 2021-12-31 14:51:15 +01:00
parent 4752545a69
commit 93882f7fab
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docs/command-line.md
View File

@ -140,6 +140,8 @@ The JUnit reporter is an xml format that follows the structure of the JUnit XML
This option may be passed multiple times to use multiple (different) reporters at the same time. See [Reporters](reporters.md#multiple-reporters) for details. This option may be passed multiple times to use multiple (different) reporters at the same time. See [Reporters](reporters.md#multiple-reporters) for details.
As with the `--out` flag, `-` means writing to stdout.
_Note: There is currently no way to escape `::` in the reporter spec, _Note: There is currently no way to escape `::` in the reporter spec,
and thus reporter/file names with `::` in them will not work properly. and thus reporter/file names with `::` in them will not work properly.
As `::` in paths is relatively obscure (unlike `:`), we do not consider As `::` in paths is relatively obscure (unlike `:`), we do not consider
@ -192,6 +194,11 @@ If one or more test-specs have been supplied too then only the matching tests wi
Use this option to send all output to a file. By default output is sent to stdout (note that uses of stdout and stderr *from within test cases* are redirected and included in the report - so even stderr will effectively end up on stdout). Use this option to send all output to a file. By default output is sent to stdout (note that uses of stdout and stderr *from within test cases* are redirected and included in the report - so even stderr will effectively end up on stdout).
Using `-` as the filename sends the output to stdout.
> Support for `-` as the filename was introduced in Catch2 X.Y.Z
<a id="naming-a-test-run"></a> <a id="naming-a-test-run"></a>
## Naming a test run ## Naming a test run
<pre>-n, --name &lt;name for test run></pre> <pre>-n, --name &lt;name for test run></pre>

3
src/catch2/internal/catch_stream.cpp
View File

@ -124,8 +124,9 @@ namespace Detail {
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
auto makeStream( std::string const& filename ) -> Detail::unique_ptr<IStream const> { auto makeStream( std::string const& filename ) -> Detail::unique_ptr<IStream const> {
if( filename.empty() ) if ( filename.empty() || filename == "-" ) {
return Detail::make_unique<Detail::CoutStream>(); return Detail::make_unique<Detail::CoutStream>();
}
else if( filename[0] == '%' ) { else if( filename[0] == '%' ) {
if( filename == "%debug" ) if( filename == "%debug" )
return Detail::make_unique<Detail::DebugOutStream>(); return Detail::make_unique<Detail::DebugOutStream>();

20
tests/CMakeLists.txt
View File

@ -451,6 +451,26 @@ set_tests_properties("MultiReporter::NonCapturingReportersPropagateStdout"
PASS_REGULAR_EXPRESSION "A string sent to stderr via clog" PASS_REGULAR_EXPRESSION "A string sent to stderr via clog"
) )
add_test(NAME "Outputs::DashAsOutLocationSendsOutputToStdout"
COMMAND
$<TARGET_FILE:SelfTest> "Factorials are computed"
--out=-
)
set_tests_properties("Outputs::DashAsOutLocationSendsOutputToStdout"
PROPERTIES
PASS_REGULAR_EXPRESSION "All tests passed \\(5 assertions in 1 test case\\)"
)
add_test(NAME "Reporters::DashAsLocationInReporterSpecSendsOutputToStdout"
COMMAND
$<TARGET_FILE:SelfTest> "Factorials are computed"
--reporter console::-
)
set_tests_properties("Reporters::DashAsLocationInReporterSpecSendsOutputToStdout"
PROPERTIES
PASS_REGULAR_EXPRESSION "All tests passed \\(5 assertions in 1 test case\\)"
)
if (CATCH_USE_VALGRIND) if (CATCH_USE_VALGRIND)
add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>) add_test(NAME ValgrindRunTests COMMAND valgrind --leak-check=full --error-exitcode=1 $<TARGET_FILE:SelfTest>)