Mirrors/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell synced 2024-12-26 12:53:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make test errors redirectable

Browse source 
This can't use `fwprintf`, since that goes directly to actual stderr.

It needs to use the passed stream.
This commit is contained in:
Fabian Homborg 2017-01-21 12:35:38 +01:00
parent 2e38cf2a4b
commit ab3149257b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/builtin_test.cpp
View file

@ -810,11 +810,11 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
expression *expr = test_parser::parse_args(args, err, program_name); expression *expr = test_parser::parse_args(args, err, program_name);
if (!expr) { if (!expr) {
#if 0 #if 0
fwprintf(stderr, L"Oops! test was given args:\n"); streams.err.append(L"Oops! test was given args:\n");
for (size_t i=0; i < argc; i++) { for (size_t i=0; i < argc; i++) {
fwprintf(stderr, L"\t%ls\n", args.at(i).c_str()); streams.err.append_format(L"\t%ls\n", args.at(i).c_str());
} }
fwprintf(stderr, L"and returned parse error: %ls\n", err.c_str()); streams.err.append_format(L"and returned parse error: %ls\n", err.c_str());
#endif #endif
streams.err.append(err); streams.err.append(err);
return BUILTIN_TEST_FAIL; return BUILTIN_TEST_FAIL;
@ -823,9 +823,9 @@ int builtin_test(parser_t &parser, io_streams_t &streams, wchar_t **argv) {
wcstring_list_t eval_errors; wcstring_list_t eval_errors;
bool result = expr->evaluate(eval_errors); bool result = expr->evaluate(eval_errors);
if (!eval_errors.empty() && !should_suppress_stderr_for_tests()) { if (!eval_errors.empty() && !should_suppress_stderr_for_tests()) {
fwprintf(stderr, L"test returned eval errors:\n"); streams.err.append(L"test returned eval errors:\n");
for (size_t i = 0; i < eval_errors.size(); i++) { for (size_t i = 0; i < eval_errors.size(); i++) {
fwprintf(stderr, L"\t%ls\n", eval_errors.at(i).c_str()); streams.err.append_format(L"\t%ls\n", eval_errors.at(i).c_str());
} }
} }
delete expr; delete expr;