X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=cae41b23cd9659d2ec390a576fd3c8026ab716fe;hb=962971d24e31ba0a82094e1786a2bfce124cc29f;hp=a425a297259efc612acd3a47f97040dadada2237;hpb=ec7fe110c51e4220c99be8191686c632c61e9e0c;p=lttng-tools.git

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index a425a2972..cae41b23c 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -19,13 +19,12 @@ 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=906
-NUM_KERNEL_TESTS=840
+NUM_UST_TESTS=1110
+NUM_KERNEL_TESTS=1044
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -643,6 +642,114 @@ UST_FILTERS=(
 	intfield
 	$issue_356_filter
 
+	true_statement
+	"1&1"
+
+	true_statement
+	"0|1"
+
+	true_statement
+	"0^1"
+
+	true_statement
+	"seqfield4[1]==2"
+
+	true_statement
+	"arrfield1[1]==2"
+
+	true_statement
+	"arrfield1[1]==2"
+
+	true_statement
+	"arrfield3[1]==2"
+
+	true_statement
+	"seqfield3[1]==2"
+
+	true_statement
+	"1 | (1 | (1 | 1))"
+
+	true_statement
+	"1 >= (1 >= (1 >= 1))"
+
+	true_statement
+	"(0x101 & 0x100) == 0x100"
+
+	true_statement
+	"(0x101 | 0x10100) == 0x10101"
+
+	true_statement
+	"(0xF00F0F ^ 0xFF0F00) == 0x0F000F"
+
+	true_statement
+	"(1 << 1) == 2"
+
+	true_statement
+	"(4 >> 1) == 2"
+
+	true_statement
+	"(1 << 8) == 256"
+
+	true_statement
+	"(262144 >> 16) == 4"
+
+	true_statement
+	"(~0 & 0xffff) == 0xffff"
+
+	true_statement
+	"(~0 & 0xffffffff) == 0xffffffff"
+
+	true_statement
+	"(~0 & 0xffffffffffffffff) == 0xffffffffffffffff"
+
+	true_statement
+	"-1==~0"
+
+	true_statement	# unsigned bitwise ops
+	"~0>>4==0x0fffffffffffffff"
+
+	has_no_event
+	"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"
+
+	true_statement
+	"(1 << 63) == 9223372036854775808"
+
+	true_statement
+	"(arrfield1[2] & 1) == 1"
+
+	true_statement
+	"(arrfield1[2] | 0x111000) == 0x111003"
+
+	true_statement
+	"(arrfield1[0] | arrfield1[1] | arrfield1[2]) == 0x3"
+
+	true_statement
+	"(seqfield4[2] & 1) == 1"
+
+	true_statement
+	"(seqfield4[2] | 0x111000) == 0x111003"
+
 	true_statement
 	"intfield < 0xDEADBEEF"
 
@@ -736,12 +843,6 @@ UST_FILTERS=(
 	has_no_event
 	"0 == \$ctx.vtid.blah"
 
-	has_no_event
-	"\$ctx.44 == 0"
-
-	has_no_event
-	"0 == \$ctx.44"
-
 	END
 )
 
@@ -1020,6 +1121,114 @@ KERNEL_FILTERS=(
 	intfield
 	$issue_356_filter
 
+	true_statement
+	"1&1"
+
+	true_statement
+	"0|1"
+
+	true_statement
+	"0^1"
+
+	true_statement
+	"seqfield4[1]==2"
+
+	true_statement
+	"arrfield1[1]==2"
+
+	true_statement
+	"arrfield1[1]==2"
+
+	true_statement
+	"arrfield3[1]==2"
+
+	true_statement
+	"seqfield3[1]==2"
+
+	true_statement
+	"1 | (1 | (1 | 1))"
+
+	true_statement
+	"1 >= (1 >= (1 >= 1))"
+
+	true_statement
+	"(0x101 & 0x100) == 0x100"
+
+	true_statement
+	"(0x101 | 0x10100) == 0x10101"
+
+	true_statement
+	"(0xF00F0F ^ 0xFF0F00) == 0x0F000F"
+
+	true_statement
+	"(1 << 1) == 2"
+
+	true_statement
+	"(4 >> 1) == 2"
+
+	true_statement
+	"(1 << 8) == 256"
+
+	true_statement
+	"(262144 >> 16) == 4"
+
+	true_statement
+	"(~0 & 0xffff) == 0xffff"
+
+	true_statement
+	"(~0 & 0xffffffff) == 0xffffffff"
+
+	true_statement
+	"(~0 & 0xffffffffffffffff) == 0xffffffffffffffff"
+
+	true_statement
+	"-1==~0"
+
+	true_statement	# unsigned bitwise ops
+	"~0>>4==0x0fffffffffffffff"
+
+	has_no_event
+	"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"
+
+	true_statement
+	"(1 << 63) == 9223372036854775808"
+
+	true_statement
+	"(arrfield1[2] & 1) == 1"
+
+	true_statement
+	"(arrfield1[2] | 0x111000) == 0x111003"
+
+	true_statement
+	"(arrfield1[0] | arrfield1[1] | arrfield1[2]) == 0x3"
+
+	true_statement
+	"(seqfield4[2] & 1) == 1"
+
+	true_statement
+	"(seqfield4[2] | 0x111000) == 0x111003"
+
 	true_statement
 	"intfield < 0xDEADBEEF"
 
@@ -1113,12 +1322,6 @@ KERNEL_FILTERS=(
 	has_no_event
 	"0 == \$ctx.vtid.blah"
 
-	has_no_event
-	"\$ctx.44 == 0"
-
-	has_no_event
-	"0 == \$ctx.44"
-
 	stringfield_has_events
 	'stringfield == "test"'
 
@@ -1272,7 +1475,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