Tests: use babeltrace2 for all tests

[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 ce662180e7dbd615726c6113d6e3fefb1044e2bb..7e764ca5d0caf10fc5ecee465dbca50ba719e932 100755 (executable)
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -94,11 +94,10 @@ function test_valid_filter
        event_name="$3"
        filter="$4"
        validator="$5"
+       local trace_path=$(mktemp --tmpdir -d tmp.test_filtering_invalid_filters_trace_path.XXXXXX)
 
        diag "Test valid $domain_name filter: $filter"
 
-       trace_path=$(mktemp -d)
-
        # Create session
        create_lttng_session_ok $SESSION_NAME $trace_path
 
@@ -113,7 +112,7 @@ function test_valid_filter
        # Destroy session
        destroy_lttng_session_ok $SESSION_NAME
 
-       stats=`babeltrace $trace_path | $STATS_BIN --tracepoint $event_name`
+       stats=`"$BABELTRACE_BIN" $trace_path | $STATS_BIN --tracepoint $event_name`
 
        rm -rf $trace_path
 
@@ -402,6 +401,8 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
+bail_out_if_no_babeltrace
+
 issue_356_filter="intfield > 0 && intfield > 1 && "
 issue_356_filter+="intfield > 2 && intfield > 3 && "
 issue_356_filter+="intfield > 4 && intfield > 5 && "
@@ -833,6 +834,16 @@ UST_FILTERS=(
        has_no_event
        "0 == \$ctx.vtid.blah"
 
+       # check that bytecode linker refuses to link against a
+       # non-string array.
+       has_no_event
+       'arrfield1 != "dontmatch"'
+
+       # check that bytecode linker refuses to link against a
+       # non-string sequence.
+       has_no_event
+       'seqfield1 != "dontmatch"'
+
        END
 )
 
@@ -984,16 +995,6 @@ UST_STR_FILTERS=(
        str_has_events
        '"salut vous*" == "salut*"'
 
-       # check that bytecode linker refuses to link against a
-       # non-string array.
-       str_has_no_event
-       'arrfield1 != "dontmatch"'
-
-       # check that bytecode linker refuses to link against a
-       # non-string sequence.
-       str_has_no_event
-       'seqfield1 != "dontmatch"'
-
        ${KIRK_KRAUSS_TESTS[@]}
 
        END