X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fust%2Foverlap%2Foverlap.sh;h=ebe6cfd1a638564bc08f0aef50dcd9154b644745;hb=785d2d0dc3aec3a4e44fcf677155dd07e8e4cc1f;hp=eed949d2c83aa3c4983702dbd6a8aa55431d2666;hpb=26b53d3b7ce1812a2ebc2c7153a50d35bba2a270;p=lttng-tools.git

diff --git a/tests/ust/overlap/overlap.sh b/tests/ust/overlap/overlap.sh
index eed949d2c..ebe6cfd1a 100755
--- a/tests/ust/overlap/overlap.sh
+++ b/tests/ust/overlap/overlap.sh
@@ -43,41 +43,39 @@ fi
 
 run_demo_app()
 {
-	local dir=`pwd`
-
-	cd demo
+	cd $CURDIR/demo
 
 	# Start test
 	echo -n "Starting application... "
-	./$CURDIR/demo-trace >/dev/null 2>&1
+	./demo-trace >/dev/null 2>&1
 	echo -n "Ended "
 	print_ok
 
-	cd $dir
+	cd -
 }
 
 # Ease our life a bit ;)
 trace_match_demo1_events()
 {
-	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
-	trace_matches $DEMO_EVENT1_2 $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT1_2" $NUM_DEMO1_EVENT $TRACE_PATH
 }
 
 # Ease our life a bit ;)
 trace_match_all_demo_events()
 {
 	trace_match_demo1_events
-	trace_matches $DEMO_EVENT2 $NUM_DEMO2_EVENT $TRACE_PATH
-	trace_matches $DEMO_EVENT3 $NUM_DEMO3_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT2" $NUM_DEMO2_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT3" $NUM_DEMO3_EVENT $TRACE_PATH
 }
 
 # Ease our life a bit ;)
 trace_match_no_demo_events()
 {
-	trace_matches $DEMO_EVENT1 0 $TRACE_PATH
-	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
-	trace_matches $DEMO_EVENT2 0 $TRACE_PATH
-	trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT1" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
 }
 
 # Expect all "demo" events, no duplicate.
@@ -89,8 +87,8 @@ test_enable_simple_wildcard()
 	echo ""
 	echo "=== Simple wildcard overlap"
 
-	enable_ust_lttng_event $SESSION_NAME $event_wild1
-	enable_ust_lttng_event $SESSION_NAME $event_wild2
+	enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -112,8 +110,8 @@ test_enable_wildcard_filter()
 	echo ""
 	echo "=== Wildcard overlap with filter"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -134,8 +132,8 @@ test_enable_wildcard_filter_2()
 	echo ""
 	echo "=== Wildcard overlap with filter 2"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==0"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -156,8 +154,8 @@ test_enable_wildcard_filter_3()
 	echo ""
 	echo "=== Wildcard overlap with filter 3"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -178,8 +176,8 @@ test_enable_wildcard_filter_4()
 	echo ""
 	echo "=== Wildcard overlap with filter 4"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==0"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -200,8 +198,8 @@ test_enable_wildcard_filter_5()
 	echo ""
 	echo "=== Wildcard overlap with filter 5"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -222,8 +220,8 @@ test_enable_wildcard_filter_6()
 	echo ""
 	echo "=== Wildcard overlap with filter 6"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==0"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -247,8 +245,8 @@ test_enable_wildcard_filter_7()
 	echo ""
 	echo "=== Wildcard overlap with filter 7"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -269,8 +267,8 @@ test_enable_wildcard_filter_8()
 	echo ""
 	echo "=== Wildcard overlap with filter 8"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==0"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -291,8 +289,8 @@ test_enable_same_wildcard_filter()
 	echo ""
 	echo "=== Same wildcard overlap with filter"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1&&1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -313,8 +311,14 @@ test_enable_same_wildcard_filter_2()
 	echo ""
 	echo "=== Same wildcard overlap with filter 2"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
+	if [ $? -eq 1 ]; then
+		echo -n "FAIL is normal. Same event with same filter is denied by the sessiond "
+		print_ok
+	else
+		print_fail
+	fi
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -335,8 +339,8 @@ test_enable_same_wildcard_filter_3()
 	echo ""
 	echo "=== Same wildcard overlap with filter 3"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -357,8 +361,8 @@ test_enable_same_wildcard_filter_4()
 	echo ""
 	echo "=== Same wildcard overlap with filter 4"
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==0&&1==0"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==0&&1==0"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==0"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -379,8 +383,8 @@ test_enable_same_event_filter()
 	echo ""
 	echo "=== Enable same event with filter."
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1&&1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	disable_ust_lttng_event $SESSION_NAME "ust*"
 
@@ -406,8 +410,8 @@ test_disable_same_wildcard_filter()
 	echo ""
 	echo "=== Disable same wildcard with filter."
 
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild1 "1==1&&1==1"
-	enable_ust_lttng_event_filter $SESSION_NAME $event_wild2 "1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild1" "1==1&&1==1"
+	enable_ust_lttng_event_filter $SESSION_NAME "$event_wild2" "1==1"
 
 	disable_ust_lttng_event $SESSION_NAME "ust*"
 
@@ -432,9 +436,9 @@ test_enable_bad_wildcard()
 	echo ""
 	echo "=== Enable bad wildcard"
 
-	enable_ust_lttng_event $SESSION_NAME $event_wild1
-	enable_ust_lttng_event $SESSION_NAME $event_wild2
-	enable_ust_lttng_event $SESSION_NAME $event_wild3
+	enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event $SESSION_NAME "$event_wild2"
+	enable_ust_lttng_event $SESSION_NAME "$event_wild3"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -455,8 +459,8 @@ test_enable_simple_wildcard_2()
 	echo ""
 	echo "=== Simple wildcard 2"
 
-	enable_ust_lttng_event $SESSION_NAME $event_wild1
-	enable_ust_lttng_event $SESSION_NAME $event_wild2
+	enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -590,11 +594,11 @@ test_disable_simple_wildcard()
 	echo ""
 	echo "=== Disable simple wildcard"
 
-	enable_ust_lttng_event $SESSION_NAME $event_wild1
-	enable_ust_lttng_event $SESSION_NAME $event_wild2
+	enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
-	disable_ust_lttng_event $SESSION_NAME $event_wild1
-	disable_ust_lttng_event $SESSION_NAME $event_wild2
+	disable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	disable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -616,10 +620,10 @@ test_disable_wildcard_overlap()
 	echo ""
 	echo "=== Disable wildcard overlap"
 
-	enable_ust_lttng_event $SESSION_NAME $event_wild1
-	enable_ust_lttng_event $SESSION_NAME $event_wild2
+	enable_ust_lttng_event $SESSION_NAME "$event_wild1"
+	enable_ust_lttng_event $SESSION_NAME "$event_wild2"
 
-	disable_ust_lttng_event $SESSION_NAME $event_wild1
+	disable_ust_lttng_event $SESSION_NAME "$event_wild1"
 
 	start_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
@@ -628,10 +632,10 @@ test_disable_wildcard_overlap()
 	stop_lttng_tracing $SESSION_NAME >/dev/null 2>&1
 
 	# Expect only "ust_tests_demo" events.
-	trace_matches $DEMO_EVENT1 $NUM_DEMO1_EVENT $TRACE_PATH
-	trace_matches $DEMO_EVENT1_2 0 $TRACE_PATH
-	trace_matches $DEMO_EVENT2 0 $TRACE_PATH
-	trace_matches $DEMO_EVENT3 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT1" $NUM_DEMO1_EVENT $TRACE_PATH
+	trace_matches "$DEMO_EVENT1_2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT2" 0 $TRACE_PATH
+	trace_matches "$DEMO_EVENT3" 0 $TRACE_PATH
 	return $?
 }