X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Ffiltering%2Ftest_valid_filter;h=e76ffa25f2480998be378929cda20ef9dde369a4;hb=7539dcec4401832f0557f85daf6c8564615170f6;hp=6d1009a48eeaa881f11a02e186726a4b4238826c;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index 6d1009a48..e76ffa25f 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -13,8 +13,8 @@ STATS_BIN="$TESTDIR/utils/babelstats.pl"
 SESSION_NAME="valid_filter"
 NR_ITER=100
 NUM_GLOBAL_TESTS=2
-NUM_UST_TESTS=1110
-NUM_KERNEL_TESTS=1044
+NUM_UST_TESTS=1122
+NUM_KERNEL_TESTS=1056
 NUM_TESTS=$(($NUM_UST_TESTS+$NUM_KERNEL_TESTS+$NUM_GLOBAL_TESTS))
 
 source $TESTDIR/utils/utils.sh
@@ -94,11 +94,10 @@ function test_valid_filter
 	event_name="$3"
 	filter="$4"
 	validator="$5"
+	local trace_path=$(mktemp --tmpdir -d tmp.test_filtering_invalid_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
 
@@ -833,6 +832,16 @@ UST_FILTERS=(
 	has_no_event
 	"0 == \$ctx.vtid.blah"
 
+	# 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"'
+
 	END
 )
 
@@ -1426,6 +1435,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
@@ -1465,7 +1484,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