sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-26 01:49:31 +03:00
Code Activity

ctdb-tests: Capture output in $out on failure as well

Browse Source 
BUG: https://bugzilla.samba.org/show_bug.cgi?id=13924

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
(cherry picked from commit cf00db4035)
This commit is contained in:
Martin Schwenke
2019-05-13 17:40:15 +10:00
committed by Karolin Seeger
parent 1eb5d2e4fc
commit 0ffba5145c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ctdb/tests/scripts/integration.bash
View File

@ -109,7 +109,11 @@ try_command_on_node ()
local cmd="$*"
if ! onnode -q $onnode_opts "$nodespec" "$cmd" >"$outfile" 2>&1 ; then
local status=0
onnode -q $onnode_opts "$nodespec" "$cmd" >"$outfile" 2>&1 || status=$?
out=$(dd if="$outfile" bs=1k count=1 2>/dev/null)
if [ $status -ne 0 ] ; then
echo "Failed to execute \"$cmd\" on node(s) \"$nodespec\""
cat "$outfile"
return 1
@ -119,8 +123,6 @@ try_command_on_node ()
echo "Output of \"$cmd\":"
cat "$outfile"
fi
out=$(dd if="$outfile" bs=1k count=1 2>/dev/null)
}
sanity_check_output ()