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 babelstats.pl with bt2 plugins
[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 cd5b1a3b94f1a620097fcaad0db6118e9ec32b98..79a9d85f237c393317e9df6da9ae369aeb3a29d0 100755
(executable)
--- a/
tests/regression/tools/filtering/test_valid_filter
+++ b/
tests/regression/tools/filtering/test_valid_filter
@@
-9,7
+9,8
@@
TEST_DESC="Filtering - Valid filters"
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
CURDIR=$(dirname $0)/
TESTDIR=$CURDIR/../../..
-STATS_BIN="$TESTDIR/utils/babelstats.pl"
+BT2_PLUGINS_DIR="${TESTDIR}/utils/bt2_plugins"
+
SESSION_NAME="valid_filter"
NR_ITER=100
NUM_GLOBAL_TESTS=2
SESSION_NAME="valid_filter"
NR_ITER=100
NUM_GLOBAL_TESTS=2
@@
-110,16
+111,12
@@
function test_valid_filter
stop_lttng_tracing_ok $SESSION_NAME
# Destroy session
stop_lttng_tracing_ok $SESSION_NAME
# Destroy session
- destroy_lttng_session_ok $SESSION_NAME
-
- stats=`"$BABELTRACE_BIN" $trace_path | $STATS_BIN --tracepoint $event_name`
+ destroy_lttng_session_ok $SESSION_NAME --no-wait
- rm -rf $trace_path
+ stats=$("${BABELTRACE_BIN}" --plugin-path "${BT2_PLUGINS_DIR}" "${trace_path}" -c filter.lttngtest.event_name -p "names=[\"${event_name}\"]" -c sink.lttngtest.field_stats)
$validator "$stats"
$validator "$stats"
-
ok $? "Validate trace filter output"
ok $? "Validate trace filter output"
-
rm -rf $trace_path
}
rm -rf $trace_path
}
@@
-1454,13
+1451,7
@@
KERNEL_FILTERS=(
IFS=$OLDIFS
IFS=$OLDIFS
-if [ "$(id -u)" == "0" ]; then
- isroot=1
-else
- isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all kernel valid filter tests." $NUM_KERNEL_TESTS ||
+check_skip_kernel_test "$NUM_KERNEL_TESTS" "Skipping kernel valid filter tests." ||
{
diag "Test kernel valid filters"
{
diag "Test kernel valid filters"
This page took
0.024918 seconds
and
4
git commands to generate.