diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-06-13 16:30:45 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2013-06-14 15:15:07 +1000 |
| commit | d82c0ef923e2214a96e6dbc0ed77e36b5291c5cb (patch) | |
| tree | 24075589e02a31e783d9f951cf19690dddafb065 /ctdb/tests | |
| parent | 02dd1bf00f5fb9bb9b77aa98119c38d7404192a9 (diff) | |
| download | samba-d82c0ef923e2214a96e6dbc0ed77e36b5291c5cb.tar.gz samba-d82c0ef923e2214a96e6dbc0ed77e36b5291c5cb.tar.xz samba-d82c0ef923e2214a96e6dbc0ed77e36b5291c5cb.zip | |
tests/eventscripts: Fix -X tracing in iterate_test()
... and delete a bogus comment.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 0e2b5a8f89440a53f996482ac0c98b31a4f2cad3)
Diffstat (limited to 'ctdb/tests')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index def117ed53..cb08b30dce 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -792,11 +792,6 @@ EOF # Any args are passed to the eventscript. -# Eventscript tracing can be done by setting: -# EVENTSCRIPTS_TESTS_TRACE="sh -x" - -# or similar. This will almost certainly make a test fail but is -# useful for debugging. simple_test () { [ -n "$event" ] || die 'simple_test: $event not set' @@ -901,7 +896,11 @@ iterate_test () shift 2 fi - _out=$($EVENTSCRIPTS_TESTS_TRACE "${CTDB_BASE}/events.d/$script" "$event" $args 2>&1) + _trace="" + if $TEST_COMMAND_TRACE ; then + _trace="sh -x" + fi + _out=$($_trace "${CTDB_BASE}/events.d/$script" "$event" $args 2>&1) _rc=$? if [ -n "$OUT_FILTER" ] ; then |