projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Gen-ust-events: use options instead of arguments
[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 4c7ac976f870abc8029b4ddc5d5bbb1b076de6b9..2d5d0ca5b07352d4538453be2f8c952d270df927 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,45
+36,54
@@
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_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 -i $NR_ITER -w $NR_USEC_WAIT --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
+
+ start_lttng_tracing_ok $SESSION_NAME
+
+ touch ${file_sync_before_last}
- start_lttng_tracing $SESSION_NAME
# Wait for the applications started in background
# Wait for the applications started in background
- wait
${!}
+ 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_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 -i $NR_ITER -w $NR_USEC_WAIT \
+ --sync-after-first-event ${file_sync_after_first} >/dev/null 2>&1
+
+ 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
+ rm -f ${file_sync_after_first}
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
This page took
0.025005 seconds
and
5
git commands to generate.