X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=ce662180e7dbd615726c6113d6e3fefb1044e2bb;hp=722a6f6ad94e6bcc7a6eb3e73d24dac86032d3d5;hb=c99adc64597b97d7a46edeeb44a553c082b8d8df;hpb=116d3c01872d62ee86bdbd0aea575b12fbc9c272 diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter index 722a6f6ad..ce662180e 100755 --- a/tests/regression/tools/filtering/test_valid_filter +++ b/tests/regression/tools/filtering/test_valid_filter @@ -1,31 +1,20 @@ #!/bin/bash # -# Copyright (C) - 2012 Christian Babeux +# Copyright (C) 2012 Christian Babeux # -# This program is free software; you can redistribute it and/or modify it -# under the terms of the GNU General Public License, version 2 only, as -# published by the Free Software Foundation. +# SPDX-License-Identifier: GPL-2.0-only # -# This program is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# this program; if not, write to the Free Software Foundation, Inc., 51 -# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. TEST_DESC="Filtering - Valid filters" CURDIR=$(dirname $0)/ TESTDIR=$CURDIR/../../.. -LTTNG_BIN="lttng" STATS_BIN="$TESTDIR/utils/babelstats.pl" SESSION_NAME="valid_filter" NR_ITER=100 NUM_GLOBAL_TESTS=2 -NUM_UST_TESTS=1074 -NUM_KERNEL_TESTS=1008 +NUM_UST_TESTS=1122 +NUM_KERNEL_TESTS=1056 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS)) source $TESTDIR/utils/utils.sh @@ -674,13 +663,13 @@ UST_FILTERS=( "1 >= (1 >= (1 >= 1))" true_statement - "0x101 & 0x100 == 0x100" + "(0x101 & 0x100) == 0x100" true_statement - "0x101 | 0x10100 == 0x10101" + "(0x101 | 0x10100) == 0x10101" true_statement - "0xF00F0F ^ 0xFF0F00 == 0x0F000F" + "(0xF00F0F ^ 0xFF0F00) == 0x0F000F" true_statement "(1 << 1) == 2" @@ -706,11 +695,29 @@ UST_FILTERS=( true_statement "-1==~0" - true_statement - "1<<1==2" # C99 operator priority: comparator before bitwise + true_statement # unsigned bitwise ops + "~0>>4==0x0fffffffffffffff" has_no_event - "!(1<<1==2)" # C99 operator priority: comparator before bitwise + "1<<-1" + + has_no_event + "1<<10000" + + true_statement # comparator is signed, shift is unsigned + "(1<<63) < 0" + + true_statement + "(1<<2!=4)==0" # operator priority: shift before equality + + true_statement + "1&3==1" # operator priority: masks before equality + + true_statement + "(3|1==3)==1" # operator priority: masks before equality + + true_statement + "(2^1==3)==1" # operator priority: masks before equality true_statement "(1 << 32) == 4294967296" @@ -719,19 +726,19 @@ UST_FILTERS=( "(1 << 63) == 9223372036854775808" true_statement - "arrfield1[2] & 1 == 1" + "(arrfield1[2] & 1) == 1" true_statement - "arrfield1[2] | 0x111000 == 0x111003" + "(arrfield1[2] | 0x111000) == 0x111003" true_statement "(arrfield1[0] | arrfield1[1] | arrfield1[2]) == 0x3" true_statement - "seqfield4[2] & 1 == 1" + "(seqfield4[2] & 1) == 1" true_statement - "seqfield4[2] | 0x111000 == 0x111003" + "(seqfield4[2] | 0x111000) == 0x111003" true_statement "intfield < 0xDEADBEEF" @@ -977,6 +984,16 @@ 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 @@ -1135,13 +1152,13 @@ KERNEL_FILTERS=( "1 >= (1 >= (1 >= 1))" true_statement - "0x101 & 0x100 == 0x100" + "(0x101 & 0x100) == 0x100" true_statement - "0x101 | 0x10100 == 0x10101" + "(0x101 | 0x10100) == 0x10101" true_statement - "0xF00F0F ^ 0xFF0F00 == 0x0F000F" + "(0xF00F0F ^ 0xFF0F00) == 0x0F000F" true_statement "(1 << 1) == 2" @@ -1167,11 +1184,29 @@ KERNEL_FILTERS=( true_statement "-1==~0" - true_statement - "1<<1==2" # C99 operator priority: comparator before bitwise + true_statement # unsigned bitwise ops + "~0>>4==0x0fffffffffffffff" + + has_no_event + "1<<-1" has_no_event - "!(1<<1==2)" # C99 operator priority: comparator before bitwise + "1<<10000" + + true_statement # comparator is signed, shift is unsigned + "(1<<63) < 0" + + true_statement + "(1<<2!=4)==0" # operator priority: shift before equality + + true_statement + "1&3==1" # operator priority: masks before equality + + true_statement + "(3|1==3)==1" # operator priority: masks before equality + + true_statement + "(2^1==3)==1" # operator priority: masks before equality true_statement "(1 << 32) == 4294967296" @@ -1180,19 +1215,19 @@ KERNEL_FILTERS=( "(1 << 63) == 9223372036854775808" true_statement - "arrfield1[2] & 1 == 1" + "(arrfield1[2] & 1) == 1" true_statement - "arrfield1[2] | 0x111000 == 0x111003" + "(arrfield1[2] | 0x111000) == 0x111003" true_statement "(arrfield1[0] | arrfield1[1] | arrfield1[2]) == 0x3" true_statement - "seqfield4[2] & 1 == 1" + "(seqfield4[2] & 1) == 1" true_statement - "seqfield4[2] | 0x111000 == 0x111003" + "(seqfield4[2] | 0x111000) == 0x111003" true_statement "intfield < 0xDEADBEEF" @@ -1401,6 +1436,16 @@ KERNEL_FILTERS=( has_no_event 'stringfield == "test\*"' + # 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"' + ${KIRK_KRAUSS_TESTS[@]} END @@ -1440,7 +1485,7 @@ skip $isroot "Root access is needed. Skipping all kernel valid filter tests." $N i=$(( i + 2 )) done - rmmod lttng-test + modprobe --remove lttng-test } stop_lttng_sessiond