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
/
filtering
/
test_valid_filter
diff --git
a/tests/regression/tools/filtering/test_valid_filter
b/tests/regression/tools/filtering/test_valid_filter
index 7170eb57c94775d6f2bcdbb926770eb00c7caa7c..42f32e70583aae15f03dc08241067cce7e322c08 100755
(executable)
--- a/
tests/regression/tools/filtering/test_valid_filter
+++ b/
tests/regression/tools/filtering/test_valid_filter
@@
-21,11
+21,11
@@
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
LTTNG_BIN="lttng"
BIN_NAME="gen-ust-events"
TESTDIR=$CURDIR/../../..
LTTNG_BIN="lttng"
BIN_NAME="gen-ust-events"
-STATS_BIN="babelstats.pl"
+STATS_BIN="
$TESTDIR/utils/
babelstats.pl"
SESSION_NAME="valid_filter"
EVENT_NAME="tp:tptest"
NR_ITER=100
SESSION_NAME="valid_filter"
EVENT_NAME="tp:tptest"
NR_ITER=100
-NUM_TESTS=
338
+NUM_TESTS=
290
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-46,15
+46,7
@@
function enable_ust_lttng_event_filter()
function run_apps
{
function run_apps
{
- ./$CURDIR/$BIN_NAME $NR_ITER & >/dev/null 2>&1
-}
-
-function wait_apps
-{
- while [ -n "$(pidof $BIN_NAME)" ]; do
- sleep 1
- done
- pass "Wait for application end"
+ ./$CURDIR/$BIN_NAME $NR_ITER >/dev/null 2>&1
}
function test_valid_filter
}
function test_valid_filter
@@
-67,21
+59,20
@@
function test_valid_filter
trace_path=$(mktemp -d)
# Create session
trace_path=$(mktemp -d)
# Create session
- create_lttng_session $SESSION_NAME $trace_path
+ create_lttng_session
_ok
$SESSION_NAME $trace_path
# Enable filter
enable_ust_lttng_event_filter $SESSION_NAME $EVENT_NAME $filter
# Trace apps
# Enable filter
enable_ust_lttng_event_filter $SESSION_NAME $EVENT_NAME $filter
# Trace apps
- start_lttng_tracing $SESSION_NAME
+ start_lttng_tracing
_ok
$SESSION_NAME
run_apps
run_apps
- wait_apps
- stop_lttng_tracing $SESSION_NAME
+ stop_lttng_tracing_ok $SESSION_NAME
# Destroy session
destroy_lttng_session $SESSION_NAME
# Destroy session
destroy_lttng_session $SESSION_NAME
- stats=`babeltrace $trace_path | $
CURDIR/$
STATS_BIN --tracepoint $EVENT_NAME`
+ stats=`babeltrace $trace_path | $STATS_BIN --tracepoint $EVENT_NAME`
rm -rf $trace_path
rm -rf $trace_path
This page took
0.024879 seconds
and
4
git commands to generate.