projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor: test: wrapper for stop_lttng_tracing
[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 95c833dfff1bfe9aa1ccde81ddd60656eb00e602..44b993355398513fedbe9027e6ca336a3973d36e 100755
(executable)
--- a/
tests/regression/tools/streaming/test_ust
+++ b/
tests/regression/tools/streaming/test_ust
@@
-18,21
+18,23
@@
TEST_DESC="Streaming - User space tracing"
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
-BIN_NAME="gen-ust-events"
+NR_ITER=5
+NR_USEC_WAIT=1000000
+TESTAPP_PATH="$TESTDIR/utils/testapp"
+TESTAPP_NAME="gen-ust-events"
+TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
SESSION_NAME="stream"
EVENT_NAME="tp:tptest"
PID_RELAYD=0
TRACE_PATH=$(mktemp -d)
SESSION_NAME="stream"
EVENT_NAME="tp:tptest"
PID_RELAYD=0
TRACE_PATH=$(mktemp -d)
-NUM_TESTS=
20
+NUM_TESTS=
16
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
-print_test_banner "$TEST_DESC"
-
-if [ ! -x "$CURDIR/$BIN_NAME" ]; then
- BAIL_OUT "No UST nevents binary detected."
+if [ ! -x "$TESTAPP_BIN" ]; then
+ BAIL_OUT "No UST events binary detected."
fi
function lttng_create_session_uri
fi
function lttng_create_session_uri
@@
-42,54
+44,64
@@
function lttng_create_session_uri
ok $? "Create session with default path"
}
ok $? "Create session with default path"
}
-function wait_apps
-{
-
- while [ -n "$(pidof $BIN_NAME)" ]; do
- sleep 0.5
- done
- pass "Wait for applications to end"
-}
# 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"
lttng_create_session_uri
diag "Test UST streaming BEFORE tracing starts"
lttng_create_session_uri
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
+ 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
- ./$CURDIR/$BIN_NAME 5 1000000 >/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
- start_lttng_tracing $SESSION_NAME
+ touch ${file_sync_before_last}
- wait_apps
+ # Wait for the applications started in background
+ wait
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
destroy_lttng_session $SESSION_NAME
destroy_lttng_session $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"
lttng_create_session_uri
diag "Test UST streaming AFTER tracing starts"
lttng_create_session_uri
- enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
- start_lttng_tracing $SESSION_NAME
+ 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
- ./$CURDIR/$BIN_NAME 5 1000000 >/dev/null 2>&1 &
+ $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} >/dev/null 2>&1
- wait_apps
+ while [ ! -f "${file_sync_after_first}" ]; do
+ sleep 0.5
+ done
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing
_ok
$SESSION_NAME
destroy_lttng_session $SESSION_NAME
destroy_lttng_session $SESSION_NAME
+
+ # Wait for the applications started in background
+ wait
+ rm -f ${file_sync_after_first}
}
plan_tests $NUM_TESTS
}
plan_tests $NUM_TESTS
-start_lttng_sessiond
+print_test_banner "$TEST_DESC"
+
start_lttng_relayd "-o $TRACE_PATH"
start_lttng_relayd "-o $TRACE_PATH"
+start_lttng_sessiond
tests=( test_ust_before_start test_ust_after_start )
tests=( test_ust_before_start test_ust_after_start )
This page took
0.042807 seconds
and
4
git commands to generate.