X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_invalid_filter;h=2dd57b0bbbbcceb1339929b2fc44e63a5fa3120b;hb=3a1744008331a0604479d3d7461f77056fad3a64;hp=f336f71925b378d01e301d4a89880e88a9c527f2;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git diff --git a/tests/regression/tools/filtering/test_invalid_filter b/tests/regression/tools/filtering/test_invalid_filter index f336f7192..2dd57b0bb 100755 --- a/tests/regression/tools/filtering/test_invalid_filter +++ b/tests/regression/tools/filtering/test_invalid_filter @@ -24,10 +24,10 @@ TESTDIR=$CURDIR/../../.. SESSION_NAME="filter-invalid" EVENT_NAME="bogus" ENABLE_EVENT_STDERR="/tmp/invalid-filters-stderr" -TRACE_PATH=$(mktemp -d) +TRACE_PATH=$(mktemp -d -t tmp.test_filtering_invalid_filters_trace_path.XXXXXX) NUM_GLOBAL_TESTS=2 -NUM_UST_TESTS=135 -NUM_KERNEL_TESTS=135 +NUM_UST_TESTS=138 +NUM_KERNEL_TESTS=138 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS)) source $TESTDIR/utils/utils.sh @@ -94,6 +94,8 @@ plan_tests $NUM_TESTS print_test_banner "$TEST_DESC" +bail_out_if_no_babeltrace + OLDIFS="$IFS" IFS=$'\n' INVALID_FILTERS=( @@ -151,6 +153,8 @@ INVALID_FILTERS=( 'field > "hello*world"' 'field && "hello*world"' 'field || "hello*world"' + # Array expression must contain constant index + 'field[abc] == 1' ) IFS="$OLDIFS" @@ -166,13 +170,7 @@ done test_bytecode_limit -u -if [ "$(id -u)" == "0" ]; then - isroot=1 -else - isroot=0 -fi - -skip $isroot "Root access is needed. Skipping all kernel invalid filter tests." $NUM_KERNEL_TESTS || +check_skip_kernel_test "$NUM_KERNEL_TESTS" "Skipping kernel invalid filter tests." || { diag "Test kernel filters" i=0