X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=6503cba2435a789e79ea313b9001a71d0c5bcaf6;hp=722a6f6ad94e6bcc7a6eb3e73d24dac86032d3d5;hb=831b702b8e8914a3ca3b4905a55aed93c7d30bbf;hpb=116d3c01872d62ee86bdbd0aea575b12fbc9c272

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index 722a6f6ad..6503cba24 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -24,8 +24,8 @@ 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=1110
+NUM_KERNEL_TESTS=1044
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -674,13 +674,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 +706,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"
 
 	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"
@@ -719,19 +737,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"
@@ -1135,13 +1153,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 +1185,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 +1216,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"