X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_userspace_probe;h=a71320274e9b5af46ba0d71dab85476aab755adc;hb=07fc38592a616d55400029dfa074cef11ad406df;hp=43a82430eba8ef7d2c52b7b7da3d73e7be647069;hpb=6a0a91e85af12c49c2ac3e98a0da5165d5182a42;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_userspace_probe b/tests/regression/kernel/test_userspace_probe
index 43a82430e..a71320274 100755
--- a/tests/regression/kernel/test_userspace_probe
+++ b/tests/regression/kernel/test_userspace_probe
@@ -1,20 +1,10 @@
 #!/bin/bash
 #
-# Copyright (C) - 2017 Erica Bugden <erica.bugden@efficios.com>
-# Copyright (C) - 2017 Francis Deslauriers <francis.deslauriers@efficios.com>
+# Copyright (C) 2017 Erica Bugden <erica.bugden@efficios.com>
+# Copyright (C) 2017 Francis Deslauriers <francis.deslauriers@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
+# SPDX-License-Identifier: LGPL-2.1-only
 #
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 TEST_DESC="Userspace probe - Testing userspace probe on ELF symbol"
 
@@ -176,10 +166,10 @@ function test_userspace_probe_enable_implicit_probe_type ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $ELF_SYMBOL
-	validate_list  $SESSION_NAME $ELF_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "ELF"
-	validate_list  $SESSION_NAME "Function"
+	validate_list $SESSION_NAME $ELF_SYMBOL
+	validate_list $SESSION_NAME $ELF_TEST_BIN_NAME
+	validate_list $SESSION_NAME "ELF"
+	validate_list $SESSION_NAME "Function"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -198,10 +188,10 @@ function test_userspace_probe_enable_elf_symbol_exists ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $ELF_SYMBOL
-	validate_list  $SESSION_NAME $ELF_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "ELF"
-	validate_list  $SESSION_NAME "Function"
+	validate_list $SESSION_NAME $ELF_SYMBOL
+	validate_list $SESSION_NAME $ELF_TEST_BIN_NAME
+	validate_list $SESSION_NAME "ELF"
+	validate_list $SESSION_NAME "Function"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -224,10 +214,10 @@ function test_userspace_probe_enable_in_path ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $ELF_SYMBOL
-	validate_list  $SESSION_NAME $ELF_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "ELF"
-	validate_list  $SESSION_NAME "Function"
+	validate_list $SESSION_NAME $ELF_SYMBOL
+	validate_list $SESSION_NAME $ELF_TEST_BIN_NAME
+	validate_list $SESSION_NAME "ELF"
+	validate_list $SESSION_NAME "Function"
 
 	# Reset the previously saved PATH.
 	export PATH="$OLDPATH"
@@ -248,10 +238,10 @@ function test_userspace_probe_enable_full_path ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $ELF_SYMBOL
-	validate_list  $SESSION_NAME $ELF_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "ELF"
-	validate_list  $SESSION_NAME "Function"
+	validate_list $SESSION_NAME $ELF_SYMBOL
+	validate_list $SESSION_NAME $ELF_TEST_BIN_NAME
+	validate_list $SESSION_NAME "ELF"
+	validate_list $SESSION_NAME "Function"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -275,10 +265,10 @@ function test_userspace_probe_enable_colon_in_path ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $ELF_SYMBOL
-	validate_list  $SESSION_NAME $ELF_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "ELF"
-	validate_list  $SESSION_NAME "Function"
+	validate_list $SESSION_NAME $ELF_SYMBOL
+	validate_list $SESSION_NAME $ELF_TEST_BIN_NAME
+	validate_list $SESSION_NAME "ELF"
+	validate_list $SESSION_NAME "Function"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -299,7 +289,7 @@ function test_userspace_probe_elf ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$ELF_TEST_BIN"  > /dev/null
+	eval "$ELF_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -323,7 +313,7 @@ function test_userspace_probe_elf_dynamic_symbol ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$ELF_TEST_BIN"  > /dev/null
+	eval "$ELF_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -349,7 +339,7 @@ function test_userspace_probe_elf_cxx_function ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$ELF_CXX_TEST_BIN"  > /dev/null
+	eval "$ELF_CXX_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -375,7 +365,7 @@ function test_userspace_probe_elf_cxx_method ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$ELF_CXX_TEST_BIN"  > /dev/null
+	eval "$ELF_CXX_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -400,7 +390,7 @@ function test_userspace_probe_elf_disable ()
 	disable_kernel_lttng_userspace_probe_event_ok $SESSION_NAME $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$ELF_TEST_BIN"  > /dev/null
+	eval "$ELF_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	# Verify that the trace contains zero event.
@@ -423,11 +413,11 @@ function test_userspace_probe_elf_list ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $PROBE_EVENT_NAME
-	validate_list  $SESSION_NAME $ELF_SYMBOL
-	validate_list  $SESSION_NAME $ELF_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "ELF"
-	validate_list  $SESSION_NAME "Function"
+	validate_list $SESSION_NAME $PROBE_EVENT_NAME
+	validate_list $SESSION_NAME $ELF_SYMBOL
+	validate_list $SESSION_NAME $ELF_TEST_BIN_NAME
+	validate_list $SESSION_NAME "ELF"
+	validate_list $SESSION_NAME "Function"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -563,7 +553,7 @@ function test_userspace_probe_sdt ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$SDT_TEST_BIN"  > /dev/null
+	eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -587,12 +577,12 @@ function test_userspace_probe_sdt_list ()
 
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
-	validate_list  $SESSION_NAME $PROBE_EVENT_NAME
-	validate_list  $SESSION_NAME $PROVIDER
-	validate_list  $SESSION_NAME $PROBE
-	validate_list  $SESSION_NAME $SDT_TEST_BIN_NAME
-	validate_list  $SESSION_NAME "SDT"
-	validate_list  $SESSION_NAME "Tracepoint"
+	validate_list $SESSION_NAME $PROBE_EVENT_NAME
+	validate_list $SESSION_NAME $PROVIDER
+	validate_list $SESSION_NAME $PROBE
+	validate_list $SESSION_NAME $SDT_TEST_BIN_NAME
+	validate_list $SESSION_NAME "SDT"
+	validate_list $SESSION_NAME "Tracepoint"
 
 	destroy_lttng_session_ok $SESSION_NAME
 
@@ -671,7 +661,7 @@ function test_userspace_probe_sdt_one_probe ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$SDT_TEST_BIN"  > /dev/null
+	eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -696,7 +686,7 @@ function test_userspace_probe_sdt_two_probes ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$SDT_TEST_BIN"  > /dev/null
+	eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -721,7 +711,7 @@ function test_userspace_probe_sdt_in_shared_object ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$SDT_TEST_BIN"  > /dev/null
+	eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -746,7 +736,7 @@ function test_userspace_probe_sdt_in_shared_object_dlopen ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$SDT_TEST_BIN"  > /dev/null
+	eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -771,7 +761,7 @@ function test_userspace_probe_sdt_in_shared_object_ldpreload ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	LD_PRELOAD="$SDT_TEST_BIN_DIR/libzzz.so" eval "$SDT_TEST_BIN"  > /dev/null
+	LD_PRELOAD="$SDT_TEST_BIN_DIR/libzzz.so" eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"
@@ -796,7 +786,7 @@ function test_userspace_probe_sdt_with_arg ()
 	lttng_enable_kernel_userspace_probe_event_ok $SESSION_NAME "$ENABLE_EXPR" $PROBE_EVENT_NAME
 
 	start_lttng_tracing_ok $SESSION_NAME
-	eval "$SDT_TEST_BIN"  > /dev/null
+	eval "$SDT_TEST_BIN" > /dev/null
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	validate_trace $PROBE_EVENT_NAME "$TRACE_PATH"