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 6e6e5a752e2ecb8288c2e22506c629d69d0178ac..44b993355398513fedbe9027e6ca336a3973d36e 100755
(executable)
--- a/
tests/regression/tools/streaming/test_ust
+++ b/
tests/regression/tools/streaming/test_ust
@@
-18,73
+18,90
@@
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)
-source $TESTDIR/utils/utils.sh
+NUM_TESTS=16
-print_test_banner "$TEST_DESC"
+source $TESTDIR/utils/utils.sh
-if [ ! -x "$CURDIR/$BIN_NAME" ]; then
- echo -e "No UST nevents binary detected. Passing."
- exit 0
+if [ ! -x "$TESTAPP_BIN" ]; then
+ 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
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"
}
}
-function wait_apps
-{
- echo -n "Waiting for applications to end"
- while [ -n "$(pidof $BIN_NAME)" ]; do
- echo -n "."
- sleep 0.5
- done
- echo ""
-}
# MUST set TESTDIR before calling those functions
function test_ust_before_start ()
{
# MUST set TESTDIR before calling those functions
function test_ust_before_start ()
{
- echo -e "\n=== Testing UST streaming BEFORE tracing starts\n"
+ 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
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
+
+ touch ${file_sync_before_last}
- start_lttng_tracing $SESSION_NAME
+ # Wait for the applications started in background
+ wait
- wait_apps
- 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 ()
{
- echo -e "\n=== Testing UST streaming AFTER tracing starts\n"
+ local file_sync_after_first=$(mktemp -u)
+
+ diag "Test UST streaming AFTER tracing starts"
lttng_create_session_uri
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
- stop_lttng_tracing $SESSION_NAME
+ while [ ! -f "${file_sync_after_first}" ]; do
+ sleep 0.5
+ done
+
+ 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}
}
}
-start_lttng_sessiond
+plan_tests $NUM_TESTS
+
+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 )
@@
-103,7
+120,6
@@
do
fi
done
fi
done
-echo ""
stop_lttng_sessiond
stop_lttng_relayd
stop_lttng_sessiond
stop_lttng_relayd
This page took
0.034368 seconds
and
5
git commands to generate.