From cc0fcba6e29e04d885322893a59b0fbcd11ba7f0 Mon Sep 17 00:00:00 2001 From: John Coyle Date: Sun, 18 Oct 2015 22:39:48 -0400 Subject: [PATCH] test_rgw_admin: musl libc defines stdout as read-only. Use freopen for output redirection. Signed-off-by: John Coyle --- src/test/test_rgw_admin_log.cc | 4 +--- src/test/test_rgw_admin_meta.cc | 4 +--- src/test/test_rgw_admin_opstate.cc | 4 +--- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/src/test/test_rgw_admin_log.cc b/src/test/test_rgw_admin_log.cc index 46b69eb6f2d..f460251f20a 100644 --- a/src/test/test_rgw_admin_log.cc +++ b/src/test/test_rgw_admin_log.cc @@ -327,9 +327,7 @@ int run_rgw_admin(string& cmd, string& resp) { argv[loop++] = (char *)(*it).c_str(); } argv[loop] = NULL; - close(1); - stdout = fopen(RGW_ADMIN_RESP_PATH, "w+"); - if (!stdout) { + if (!freopen(RGW_ADMIN_RESP_PATH, "w+", stdout)) { cout << "Unable to open stdout file" << std::endl; } execv((g_test->get_rgw_admin_path()).c_str(), argv); diff --git a/src/test/test_rgw_admin_meta.cc b/src/test/test_rgw_admin_meta.cc index 5b0d6a66bdf..063b9ea88fc 100644 --- a/src/test/test_rgw_admin_meta.cc +++ b/src/test/test_rgw_admin_meta.cc @@ -321,9 +321,7 @@ int run_rgw_admin(string& cmd, string& resp) { argv[loop++] = (char *)(*it).c_str(); } argv[loop] = NULL; - close(1); - stdout = fopen(RGW_ADMIN_RESP_PATH, "w+"); - if (!stdout) { + if (!freopen(RGW_ADMIN_RESP_PATH, "w+", stdout)) { cout << "Unable to open stdout file" << std::endl; } execv((g_test->get_rgw_admin_path()).c_str(), argv); diff --git a/src/test/test_rgw_admin_opstate.cc b/src/test/test_rgw_admin_opstate.cc index a9a65f51b07..26568578c98 100644 --- a/src/test/test_rgw_admin_opstate.cc +++ b/src/test/test_rgw_admin_opstate.cc @@ -325,9 +325,7 @@ int run_rgw_admin(string& cmd, string& resp) { argv[loop++] = (char *)(*it).c_str(); } argv[loop] = NULL; - close(1); - stdout = fopen(RGW_ADMIN_RESP_PATH, "w+"); - if (!stdout) { + if (!freopen(RGW_ADMIN_RESP_PATH, "w+", stdout)) { cout << "Unable to open stdout file" << std::endl; } execv((g_test->get_rgw_admin_path()).c_str(), argv); -- 2.47.3