diff options
| author | Martin Schwenke <martin@meltin.net> | 2013-10-17 10:39:09 +1100 |
|---|---|---|
| committer | Amitay Isaacs <amitay@gmail.com> | 2013-10-22 14:34:04 +1100 |
| commit | 5d65335d602eea73598e7f267f5bca84944c978c (patch) | |
| tree | 8ac90471d729f8aadc8ba8847944599f99e97ce2 /ctdb/tests/eventscripts/scripts | |
| parent | 05f5fe917919310d7d530516cd13aac1bd2718b1 (diff) | |
| download | samba-5d65335d602eea73598e7f267f5bca84944c978c.tar.gz samba-5d65335d602eea73598e7f267f5bca84944c978c.tar.xz samba-5d65335d602eea73598e7f267f5bca84944c978c.zip | |
tests/eventscripts: Run scripts under sh by default
Some scripts are disabled by default so are no executable. Explicitly
running them under sh allows them to be run without having to mess
around and make them executable or similar.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 9437d4809bfbbb5c6a32a610665333d2f641881d)
Diffstat (limited to 'ctdb/tests/eventscripts/scripts')
| -rw-r--r-- | ctdb/tests/eventscripts/scripts/local.sh | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 0527eca78a..e6186a0723 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -909,11 +909,13 @@ simple_test () _extra_header=$(_extra_header) echo "Running eventscript \"$script $event${1:+ }$*\"" - _trace="" + _shell="" if $TEST_COMMAND_TRACE ; then - _trace="sh -x" + _shell="sh -x" + else + _shell="sh" fi - _out=$($_trace "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1) + _out=$($_shell "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1) result_check "$_extra_header" } @@ -1006,11 +1008,13 @@ iterate_test () shift 2 fi - _trace="" + _shell="" if $TEST_COMMAND_TRACE ; then - _trace="sh -x" + _shell="sh -x" + else + _shell="sh" fi - _out=$($_trace "${CTDB_BASE}/events.d/$script" "$event" $args 2>&1) + _out=$($_shell "${CTDB_BASE}/events.d/$script" "$event" $args 2>&1) _rc=$? if [ -n "$OUT_FILTER" ] ; then |