From 8ed372d9388b65dd4d3651f8850a7a1f08d984de Mon Sep 17 00:00:00 2001 From: Abdelrahman Date: Mon, 17 Jun 2024 00:18:27 +0100 Subject: [PATCH] Ensure stderr is piped to stdout to capture errors in output --- src/common/shell/commander/commander.h | 2 +- tests/shell_commander/test_shell_commander.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/shell/commander/commander.h b/src/common/shell/commander/commander.h index c2f543a..729153f 100644 --- a/src/common/shell/commander/commander.h +++ b/src/common/shell/commander/commander.h @@ -12,7 +12,7 @@ extern "C" { #define CMD_NO_EXIT(ERR) \ ((CMDResult){.exited = false, .exit_code = EXIT_FAILURE, .error = ERR}) #define wapp_shell_commander_execute(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, ...) \ - run_command(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, __VA_ARGS__, NULL) + run_command(HANDLE_OUTPUT, OUT_BUF, BUF_SIZE, __VA_ARGS__, "2>&1", NULL) typedef enum { SHELL_OUTPUT_DISCARD, diff --git a/tests/shell_commander/test_shell_commander.c b/tests/shell_commander/test_shell_commander.c index a0e1432..8ab5f9b 100644 --- a/tests/shell_commander/test_shell_commander.c +++ b/tests/shell_commander/test_shell_commander.c @@ -17,8 +17,8 @@ TestFuncResult test_commander_cmd_success(void) { } TestFuncResult test_commander_cmd_failure(void) { - CMDResult result = wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, 0, - "grep", "2>&1"); + CMDResult result = + wapp_shell_commander_execute(SHELL_OUTPUT_DISCARD, NULL, 0, "grep"); bool failed = result.exited && result.exit_code != EXIT_SUCCESS && result.error == SHELL_ERR_NO_ERROR;