Signed-off-by: Martin Schwenke <martin@meltin.net>
if [ -n "$_iteration" ] ; then
cat <<EOF
if [ -n "$_iteration" ] ; then
cat <<EOF
-##################################################
-##################################################
+==================================================
Iteration $_iteration
EOF
fi
cat <<EOF
Iteration $_iteration
EOF
fi
cat <<EOF
-##################################################
+--------------------------------------------------
Output (Exit status: ${_rc}):
Output (Exit status: ${_rc}):
-##################################################
+--------------------------------------------------
$_out
EOF
fi
if ! $_passed ; then
cat <<EOF
$_out
EOF
fi
if ! $_passed ; then
cat <<EOF
-##################################################
+--------------------------------------------------
Required output (Exit status: ${required_rc}):
Required output (Exit status: ${required_rc}):
-##################################################
+--------------------------------------------------
if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] || ! $_passed ; then
cat <<EOF
if [ "$EVENTSCRIPT_TESTS_VERBOSE" = "yes" ] || ! $_passed ; then
cat <<EOF
-##################################################
+--------------------------------------------------
CTDB_BASE="$CTDB_BASE"
CTDB_ETCDIR="$CTDB_ETCDIR"
ctdb client is "$(which ctdb)"
CTDB_BASE="$CTDB_BASE"
CTDB_ETCDIR="$CTDB_ETCDIR"
ctdb client is "$(which ctdb)"
-##################################################
+--------------------------------------------------
if $_passed ; then
echo "PASSED"
return 0
else
if $_passed ; then
echo "PASSED"
return 0
else
echo "FAILED"
return 1
fi
echo "FAILED"
return 1
fi
{
[ -n "$event" ] || die 'simple_test: $event not set'
{
[ -n "$event" ] || die 'simple_test: $event not set'
- echo "Running \"${CTDB_BASE}/events.d/$script $event\""
+ echo "Running \"$script $event $*\""
_out=$($EVENTSCRIPTS_TESTS_TRACE "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1)
_rc=$?
_out=$($EVENTSCRIPTS_TESTS_TRACE "${CTDB_BASE}/events.d/$script" "$event" "$@" 2>&1)
_rc=$?
_setup_default="$2"
shift 2
_setup_default="$2"
shift 2
- echo "Running $_repeats iterations of \"${CTDB_BASE}/events.d/$script $event\" $args"
+ echo "Running $_repeats iterations of \"$script $event\" $args"