From 80744d94f88ffa368f0ee5bfc51dcf8c217028ad Mon Sep 17 00:00:00 2001
From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 6 Oct 2015 15:41:41 -0400
Subject: [PATCH] Do not overwrite IFS globally but only locally
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---
 .../regression/tools/filtering/test_valid_filter  | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/tests/regression/tools/filtering/test_valid_filter b/tests/regression/tools/filtering/test_valid_filter
index 0a3a5a443..fe854a70c 100755
--- a/tests/regression/tools/filtering/test_valid_filter
+++ b/tests/regression/tools/filtering/test_valid_filter
@@ -72,7 +72,7 @@ function test_valid_filter
 	create_lttng_session_ok $SESSION_NAME $trace_path
 
 	# Enable filter
-	enable_lttng_event_filter $domain $SESSION_NAME $event_name $filter
+	enable_lttng_event_filter $domain $SESSION_NAME "$event_name" "$filter"
 
 	# Trace apps
 	start_lttng_tracing_ok $SESSION_NAME
@@ -344,8 +344,6 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-IFS=$'\n'
-
 issue_356_filter="intfield > 0 && intfield > 1 && "
 issue_356_filter+="intfield > 2 && intfield > 3 && "
 issue_356_filter+="intfield > 4 && intfield > 5 && "
@@ -360,6 +358,9 @@ BIN_NAME="gen-ust-events"
 
 # One to one mapping between filters and validators
 
+# Set IFS to newline to facilitate array declaration
+OLDIFS="$IFS"
+IFS=$'\n'
 UST_FILTERS=("intfield"                                                 #1
 	 "intfield > 1"                                                 #2
 	 "intfield >= 1"                                                #3
@@ -480,6 +481,8 @@ UST_VALIDATOR=("validator_intfield"                 #1
 	   "validator_has_no_event"                 #55
 )
 
+IFS="$OLDIFS"
+
 diag "Test UST valid filters"
 
 KERNEL_CHECK=0
@@ -502,7 +505,9 @@ done
 BIN_NAME="test_valid_filt"	# Current script name truncated by kernel
 
 # One to one mapping between filters and validators
-
+# Set IFS to newline to facilitate array declaration
+OLDIFS="$IFS"
+IFS=$'\n'
 KERNEL_FILTERS=("intfield"                                              #1
 	 "intfield > 1"                                                 #2
 	 "intfield >= 1"                                                #3
@@ -619,6 +624,8 @@ KERNEL_VALIDATOR=("validator_intfield"              #1
 	   "validator_has_no_event"                 #55
 )
 
+IFS=$OLDIFS
+
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
 else
-- 
2.34.1