X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=cd5b1a3b94f1a620097fcaad0db6118e9ec32b98;hb=ad3629161b520be21f977ac7902bb2c032d55612;hp=cfd8de3bfbe189b994f02e2bbdf0a76a866833f6;hpb=39ac0a0ee6d55413d4f4a800db811f5dae0ae4ae;p=lttng-tools.git diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter index cfd8de3bf..cd5b1a3b9 100755 --- 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 -d -t tmp.test_filtering_valid_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 && "