diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-04-20 16:43:17 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2012-04-27 15:40:43 +1000 |
| commit | 6757ad62f4cda14066789989fb002cee7c009cde (patch) | |
| tree | 2ff3b399f75896761dfb5f4b8be7f0d03dfc6fb8 /ctdb/tests/eventscripts/scripts | |
| parent | 6764b7b33e0a8f61b51bb4c666205147744917c7 (diff) | |
tests: Make run_tests -X more flexible - it now works with onnode
Hardcoding "sh -x" is suboptimal because some scripts, like onnode,
require bash.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 246809af64c03d26288abff5907ed46614e72b15)
Diffstat (limited to 'ctdb/tests/eventscripts/scripts')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 6d7de89465..4c2d8fe6dd 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -698,7 +698,11 @@ simple_test () _extra_header=$(_extra_header) echo "Running eventscript \"$script $event${1:+ }$*\"" - _out=$($TEST_COMMAND_TRACE "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1) + _trace="" + if $TEST_COMMAND_TRACE ; then + _trace="sh -x" + fi + _out=$($_trace "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1) result_check "$_extra_header" } |