summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8dcef14)
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
- ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name fail as expected"
+ ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name failed as expected"
else
ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
fi
else
ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
fi
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected failure on kernel channel creation $channel_name in $sess_name"
+ ok $? "Enable channel $channel_name for session $sess_name failed as expected"
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected failure on kernel channel creation $channel_name in $sess_name"
+ ok $? "Disable channel $channel_name for session $sess_name failed as expected"
- ok $ret "disable channel $channel_name for session $sess_name"
+ ok $ret "Disable channel $channel_name for session $sess_name"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected fail on session creation $sess_name in $trace_path"
+ ok $? "Create session $sess_name in $trace_path failed as expected"
else
ok $ret "Create session $sess_name in $trace_path"
fi
else
ok $ret "Create session $sess_name in $trace_path"
fi
function enable_ust_lttng_channel ()
{
function enable_ust_lttng_channel ()
{
+ local expected_to_fail=$1
local sess_name=$2
local channel_name=$3
local opt=$4
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
local sess_name=$2
local channel_name=$3
local opt=$4
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
- if [[ $expect_fail -eq "1" ]]; then
+ if [[ $expected_to_fail -eq "1" ]]; then
- ok $? "Expected fail on ust channel creation $channel_name in $sess_name"
+ ok $? "Enable channel $channel_name for session $sess_name failed as expected"
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
- ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected"
+ ok $? "Enable ust event $event_name for session $session_name failed as expected"
- ok $ret "Enable event $event_name for session $sess_name"
+ ok $ret "Enable ust event $event_name for session $sess_name"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected fail on start tracing for session: $sess_name"
+ ok $? "Start tracing for session $sess_name failed as expected"
else
ok $ret "Start tracing for session $sess_name"
fi
else
ok $ret "Start tracing for session $sess_name"
fi
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected fail on stop tracing for session: $sess_name"
+ ok $? "Stop lttng tracing for session $sess_name failed as expected"
else
ok $ret "Stop lttng tracing for session $sess_name"
fi
else
ok $ret "Stop lttng tracing for session $sess_name"
fi
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expected fail on session deletion $sess_name"
+ ok $? "Destroy session $sess_name failed as expected"
else
ok $ret "Destroy session $sess_name"
fi
else
ok $ret "Destroy session $sess_name"
fi
ret=$?
if [[ $expected_to_fail -eq 1 ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq 1 ]]; then
test "$ret" -ne "0"
- ok $? "Failed to add a snapshot output file://$trace_path as expected"
+ ok $? "Added snapshot output file://$trace_path failed as expected"
else
ok $ret "Added snapshot output file://$trace_path"
fi
else
ok $ret "Added snapshot output file://$trace_path"
fi
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Expect fail on deletion of snapshot output id $id"
+ ok $? "Deleted snapshot output id $id failed as expected"
else
ok $ret "Deleted snapshot output id $id"
fi
else
ok $ret "Deleted snapshot output id $id"
fi
local opts=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
local opts=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
- ok $? "Session successfully saved"
local opts=$1
$TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
local opts=$1
$TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
- ok $? "Load command successful"
+ ok $? "Load command with opts: $opts"
test $ret -ne "0"
ok $? "Track command failed as expected with opts: $opts"
else
test $ret -ne "0"
ok $? "Track command failed as expected with opts: $opts"
else
- ok $ret "Track command success as expected with opts: $opts"
+ ok $ret "Track command with opts: $opts"
test $ret -ne "0"
ok $? "Untrack command failed as expected with opts: $opts"
else
test $ret -ne "0"
ok $? "Untrack command failed as expected with opts: $opts"
else
- ok $ret "Untrack command success as expected with opts: $opts"
+ ok $ret "Untrack command with opts: $opts"