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>

diff --git a/tests/eventscripts/scripts/local.sh b/tests/eventscripts/scripts/local.sh
index 0527eca78a8fe0ecd190f64f0b8d9001b6a953a1..e6186a07230c12b812511e4696099267554bf66f 100644 (file)
--- a/tests/eventscripts/scripts/local.sh
+++ b/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