projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Replace usage of gen-ust-events testapp in streaming tests
[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 333b2e9a96056cf0fc43f6fd9a33b91ddd1ef8cc..785a9a8353efe813dc6fd66f318386f8afa3684e 100755
(executable)
--- a/
tests/regression/tools/streaming/test_ust
+++ b/
tests/regression/tools/streaming/test_ust
@@
-18,7
+18,11
@@
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
SESSION_NAME="stream"
EVENT_NAME="tp:tptest"
PID_RELAYD=0
@@
-29,8
+33,8
@@
NUM_TESTS=18
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
-if [ ! -x "$
CURDIR/$BIN_NAME
" ]; then
- BAIL_OUT "No UST
n
events 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,7
+46,7
@@
function lttng_create_session_uri
function wait_apps
{
function wait_apps
{
- while [ -n "$(pidof $
BIN
_NAME)" ]; do
+ while [ -n "$(pidof $
TESTAPP
_NAME)" ]; do
sleep 0.5
done
pass "Wait for applications to end"
sleep 0.5
done
pass "Wait for applications to end"
@@
-57,7
+61,7
@@
function test_ust_before_start ()
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
enable_ust_lttng_event $SESSION_NAME $EVENT_NAME
# Run 5 times with a 1 second delay
-
./$CURDIR/$BIN_NAME 5 1000000
>/dev/null 2>&1 &
+
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
>/dev/null 2>&1 &
start_lttng_tracing $SESSION_NAME
start_lttng_tracing $SESSION_NAME
@@
-75,7
+79,7
@@
function test_ust_after_start ()
start_lttng_tracing $SESSION_NAME
# Run 5 times with a 1 second delay
start_lttng_tracing $SESSION_NAME
# Run 5 times with a 1 second delay
-
./$CURDIR/$BIN_NAME 5 1000000
>/dev/null 2>&1 &
+
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT
>/dev/null 2>&1 &
wait_apps
wait_apps
This page took
0.02481 seconds
and
4
git commands to generate.