Capture stderr with/as stdout on all timeouts

ipfs · Apr 10, 2020 · 89d333b · 89d333b
1 parent 8dc2a2a
commit 89d333b
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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
 }