From 89d333b9b1d7aab8b0250e096a9a719908b3593a Mon Sep 17 00:00:00 2001 From: Peter Rabbitson Date: Fri, 10 Apr 2020 18:26:13 +0200 Subject: [PATCH] Capture stderr with/as stdout on all timeouts --- test/sharness/t0054-dag-car-import-export.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test/sharness/t0054-dag-car-import-export.sh b/test/sharness/t0054-dag-car-import-export.sh index dbf540e99505..4ca7b8a98fc1 100755 --- a/test/sharness/t0054-dag-car-import-export.sh +++ b/test/sharness/t0054-dag-car-import-export.sh @@ -30,10 +30,10 @@ do_import() { node=$1; shift touch spin.gc - timeout -s QUIT 15 bash -c "while [[ -e spin.gc ]]; do ipfsi $node repo gc 2>&1 >>gc_out; done" & gc1_pid=$! - timeout -s QUIT 15 bash -c "while [[ -e spin.gc ]]; do ipfsi $node repo gc 2>&1 >>gc_out; done" & gc2_pid=$! + timeout -s QUIT 15 bash -c "while [[ -e spin.gc ]]; do ipfsi $node repo gc &>>gc_out; done" & gc1_pid=$! + timeout -s QUIT 15 bash -c "while [[ -e spin.gc ]]; do ipfsi $node repo gc &>>gc_out; done" & gc2_pid=$! - timeout -s QUIT 10 bash -c "ipfsi $node dag import $*" + timeout -s QUIT 10 bash -c "ipfsi $node dag import $* 2>&1" rm -f spin.gc || true }