From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 23 Mar 2021 15:22:56 +0000 (-0400)
Subject: Fix: bytecode test should be in UST_FILTERS, not UST_STR_FILTERS
X-Git-Tag: v2.13.0-rc1~193
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=39ac0a0ee6d55413d4f4a800db811f5dae0ae4ae;p=lttng-tools.git

Fix: bytecode test should be in UST_FILTERS, not UST_STR_FILTERS

The UST test is in the wrong array, making it always succeed when it
should fail when run with a non-patched UST, because it uses a different
test application which does not contain the targeted fields.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I96f74e26ffdead5e03e069c944f215967b7890f2
---

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index ce662180e..cfd8de3bf 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -833,6 +833,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
 )
 
@@ -984,16 +994,6 @@ 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