projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: add session auto-loading test cases
[lttng-tools.git]
/
tests
/
regression
/
tools
/
streaming
/
test_ust
diff --git
a/tests/regression/tools/streaming/test_ust
b/tests/regression/tools/streaming/test_ust
index 480717515b49d3add63d213adee981ecfd06a053..ba3f44275a4e1bac5c5e66e192c34b1c0d7017a2 100755
(executable)
--- a/
tests/regression/tools/streaming/test_ust
+++ b/
tests/regression/tools/streaming/test_ust
@@
-25,7
+25,6
@@
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
SESSION_NAME="stream"
EVENT_NAME="tp:tptest"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
SESSION_NAME="stream"
EVENT_NAME="tp:tptest"
-PID_RELAYD=0
TRACE_PATH=$(mktemp -d)
TRACE_PATH=$(mktemp -d)
@@
-37,52
+36,55
@@
if [ ! -x "$TESTAPP_BIN" ]; then
BAIL_OUT "No UST events binary detected."
fi
BAIL_OUT "No UST events binary detected."
fi
-function lttng_create_session_uri
-{
- # Create session with default path
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
- ok $? "Create session with default path"
-}
-
-
# MUST set TESTDIR before calling those functions
function test_ust_before_start ()
{
# MUST set TESTDIR before calling those functions
function test_ust_before_start ()
{
+ local file_sync_after_first=$(mktemp -u)
+ local file_sync_before_last=$(mktemp -u)
+
diag "Test UST streaming BEFORE tracing starts"
diag "Test UST streaming BEFORE tracing starts"
- lttng_create_session_uri
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+ create_lttng_session_uri $SESSION_NAME net://localhost
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
# Run 5 times with a 1 second delay
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1 &
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
+
+ start_lttng_tracing_ok $SESSION_NAME
- #FIXME: racy missing synchro
+ touch ${file_sync_before_last}
- start_lttng_tracing $SESSION_NAME
# Wait for the applications started in background
wait
# Wait for the applications started in background
wait
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
+ destroy_lttng_session_ok $SESSION_NAME
+ rm -f ${file_sync_after_first}
+ rm -f ${file_sync_before_last}
}
function test_ust_after_start ()
{
}
function test_ust_after_start ()
{
+ local file_sync_after_first=$(mktemp -u)
+
diag "Test UST streaming AFTER tracing starts"
diag "Test UST streaming AFTER tracing starts"
- lttng_create_session_uri
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
+ create_lttng_session_uri $SESSION_NAME net://localhost
+ enable_ust_lttng_event
_ok
$SESSION_NAME $EVENT_NAME
+ start_lttng_tracing
_ok
$SESSION_NAME
# Run 5 times with a 1 second delay
# Run 5 times with a 1 second delay
- $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT >/dev/null 2>&1
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
${file_sync_after_first}
>/dev/null 2>&1
- #FIXME: racy missing synchro
+ while [ ! -f "${file_sync_after_first}" ]; do
+ sleep 0.5
+ done
- stop_lttng_tracing $SESSION_NAME
- destroy_lttng_session $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
+ destroy_lttng_session
_ok
$SESSION_NAME
# Wait for the applications started in background
wait
# Wait for the applications started in background
wait
+ rm -f ${file_sync_after_first}
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
This page took
0.031465 seconds
and
4
git commands to generate.