diff options
| author | Martin Schwenke <martin@meltin.net> | 2019-05-13 17:40:15 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2019-05-14 07:25:37 +0000 |
| commit | cf00db40355b49443263187f9d97934f91287e51 (patch) | |
| tree | 9f952fc34c6ed24e71e9adacff8028a004f2c2fb /ctdb/tests/scripts/integration.bash | |
| parent | b1a32dd7f50ed0aee3d0eea5a124cb8ddfa417ad (diff) | |
| download | samba-cf00db40355b49443263187f9d97934f91287e51.tar.gz | |
ctdb-tests: Capture output in $out on failure as well
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>
Diffstat (limited to 'ctdb/tests/scripts/integration.bash')
| -rw-r--r-- | ctdb/tests/scripts/integration.bash | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 32a729d0249..30725c48e53 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -104,7 +104,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 @@ -114,8 +118,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 () |