CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../../
-SESSIOND_BIN="lttng-sessiond"
-RELAYD_BIN="lttng-relayd"
-LTTNG_BIN="lttng"
SESSION_NAME="save-42"
CHANNEL_NAME="chan-save"
DIR=$(readlink -f $TESTDIR)
-NUM_TESTS=37
+NUM_TESTS=41
source $TESTDIR/utils/utils.sh
{
diag "Test basic save"
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+ create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+ enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+ lttng_track_ok "-p 666 -u -s $SESSION_NAME"
lttng_save $SESSION_NAME "-o $TRACE_PATH"
is_session_saved $TRACE_PATH $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
}
function test_basic_save_all()
{
diag "Test basic save all"
- create_lttng_session $SESSION_NAME-1 $TRACE_PATH
- create_lttng_session $SESSION_NAME-2 $TRACE_PATH
- create_lttng_session $SESSION_NAME-3 $TRACE_PATH
+ create_lttng_session_ok $SESSION_NAME-1 $TRACE_PATH
+ create_lttng_session_ok $SESSION_NAME-2 $TRACE_PATH
+ create_lttng_session_ok $SESSION_NAME-3 $TRACE_PATH
- enable_ust_lttng_channel $SESSION_NAME-1 $CHANNEL_NAME
- enable_ust_lttng_channel $SESSION_NAME-2 $CHANNEL_NAME
- enable_ust_lttng_channel $SESSION_NAME-3 $CHANNEL_NAME
+ enable_ust_lttng_channel_ok $SESSION_NAME-1 $CHANNEL_NAME
+ enable_ust_lttng_channel_ok $SESSION_NAME-2 $CHANNEL_NAME
+ enable_ust_lttng_channel_ok $SESSION_NAME-3 $CHANNEL_NAME
- enable_ust_lttng_event $SESSION_NAME-1 $EVENT_NAME $CHANNEL_NAME
- enable_ust_lttng_event $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
- enable_ust_lttng_event $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME-1 $EVENT_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME-2 $EVENT_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME-3 $EVENT_NAME $CHANNEL_NAME
+
+ lttng_track_ok "-p 666 -u -s $SESSION_NAME-1"
+ lttng_track_ok "-p 666 -u -s $SESSION_NAME-2"
+ lttng_track_ok "-p 666 -u -s $SESSION_NAME-3"
lttng_save "" "-a -o $TRACE_PATH"
is_session_saved $TRACE_PATH $SESSION_NAME-2
is_session_saved $TRACE_PATH $SESSION_NAME-3
- destroy_lttng_session $SESSION_NAME-1
- destroy_lttng_session $SESSION_NAME-2
- destroy_lttng_session $SESSION_NAME-3
+ destroy_lttng_session_ok $SESSION_NAME-1
+ destroy_lttng_session_ok $SESSION_NAME-2
+ destroy_lttng_session_ok $SESSION_NAME-3
}
function test_overwrite()
{
diag "Test overwrite session file"
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+ create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+ enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
lttng_save $SESSION_NAME "-o $TRACE_PATH"
is_session_saved $TRACE_PATH $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
# Create a new session with same name so we can force the overwrite
- create_lttng_session $SESSION_NAME $TRACE_PATH
- enable_ust_lttng_channel $SESSION_NAME $CHANNEL_NAME
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
+ create_lttng_session_ok $SESSION_NAME $TRACE_PATH
+ enable_ust_lttng_channel_ok $SESSION_NAME $CHANNEL_NAME
+ enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $CHANNEL_NAME
# This one MUST fail
save_lttng_fail $SESSION_NAME "-o $TRACE_PATH"
is_session_saved $TRACE_PATH $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
}
start_lttng_sessiond
break;
fi
# Only delete if successful
- #rm -rf $TRACE_PATH
+ rm -rf $TRACE_PATH
done
stop_lttng_sessiond