# The '-' before the pid number ($$) indicates 'kill' to signal the
# whole process group.
trap - SIGTERM && kill -- -$$
+ exit 1
}
+function null_pipes ()
+{
+ exec 0>/dev/null
+ exec 1>/dev/null
+ exec 2>/dev/null
+}
trap full_cleanup SIGINT SIGTERM
+# perl prove closes its child pipes before giving it a chance to run its
+# signal trap handlers. Redirect pipes to /dev/null if SIGPIPE is caught
+# to allow those trap handlers to proceed.
+
+trap null_pipes SIGPIPE
+
function print_ok ()
{
# Check if we are a terminal
local trace_path=$4
local opt=$5
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST
+ if [ -z "$trace_path" ]; then
+ # Use lttng-sessiond default output.
+ trace_path=""
+ else
+ trace_path="-o $trace_path"
+ fi
+
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN create "$sess_name" $trace_path $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [ $expected_to_fail -eq "1" ]; then
test "$ret" -ne "0"
test "$ret" -ne "0"
ok $? "Expected fail on regenerate statedump $sess_name"
else
- ok $ret "Metadata regenerate $sess_name"
+ ok $ret "Statedump regenerate $sess_name"
fi
}