X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils.sh;h=1ca298562aeb8afca9b2f9bd29494383fabc4d45;hp=8a0640bd0e2f391f61654a530180005c83dc7c01;hb=d7830591c7af9e78121ec5af69831b9dcd2afc1a;hpb=d4018451a4eb6c042b5ab5bb20c6ef0f812dc887

diff --git a/tests/utils.sh b/tests/utils.sh
index 8a0640bd0..1ca298562 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -16,6 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
 
@@ -24,8 +25,6 @@ KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
-alias realpath='readlink -f'
-
 function validate_kernel_version ()
 {
 	kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
@@ -41,17 +40,27 @@ function validate_kernel_version ()
 	return 1
 }
 
+# Generate a random string 
+#  $1 = number of characters; defaults to 16
+#  $2 = include special characters; 1 = yes, 0 = no; defaults to yes
+function randstring() 
+{
+	[ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]"
+	cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-16}
+	echo
+}
+
 function spawn_sessiond ()
 {
 	echo ""
 	echo -n "Starting session daemon... "
 	validate_kernel_version
 	if [ $? -ne 0 ]; then
-		echo -e "\n*** Kernel to old for session daemon tests ***\n"
+		echo -e "\n*** Kernel too old for session daemon tests ***\n"
 		return 2
 	fi
 
-	DIR=$(realpath $TESTDIR)
+	DIR=$(readlink -f $TESTDIR)
 
 	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
 		$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
@@ -66,6 +75,67 @@ function spawn_sessiond ()
 	return 0
 }
 
+function lttng_enable_kernel_event
+{
+	sess_name=$1
+	event_name=$2
+
+	if [ -z $event_name ]; then
+		# Enable all event if no event name specified
+		$event_name="-a"
+	fi
+
+	echo -n "Enabling kernel event $event_name for session $sess_name"
+	$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -k >/dev/null 2>&1
+	if [ $? -eq 1 ]; then
+		echo -e '\e[1;31mFAILED\e[0m'
+		return 1
+	else
+		echo -e "\e[1;32mOK\e[0m"
+	fi
+}
+
+function lttng_start_relayd
+{
+	local opt="$1"
+
+	echo -e -n "Starting lttng-relayd (opt: $opt)... "
+
+	DIR=$(readlink -f $TESTDIR)
+
+	if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+		$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 &
+		if [ $? -eq 1 ]; then
+			echo -e "\e[1;31mFAILED\e[0m"
+			return 1
+		else
+			echo -e "\e[1;32mOK\e[0m"
+		fi
+	else
+		echo -e "\e[1;32mOK\e[0m"
+	fi
+}
+
+function lttng_stop_relayd
+{
+	PID_RELAYD=`pidof lt-$RELAYD_BIN`
+
+	echo -e -n "Killing lttng-relayd (pid: $PID_RELAYD)... "
+	kill $PID_RELAYD >/dev/null 2>&1
+	if [ $? -eq 1 ]; then
+		echo -e "\e[1;31mFAILED\e[0m"
+		return 1
+	else
+		out=1
+		while [ -n "$out" ]; do
+			out=$(pidof lt-$RELAYD_BIN)
+			sleep 0.5
+		done
+		echo -e "\e[1;32mOK\e[0m"
+		return 0
+	fi
+}
+
 function start_sessiond()
 {
 	if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
@@ -103,6 +173,11 @@ function stop_sessiond ()
 		echo -e "\e[1;31mFAILED\e[0m"
 		return 1
 	else
+		out=1
+		while [ -n "$out" ]; do
+			out=$(pidof lt-$SESSIOND_BIN)
+			sleep 0.5
+		done
 		echo -e "\e[1;32mOK\e[0m"
 	fi
 }
@@ -112,7 +187,7 @@ function create_lttng_session ()
 	sess_name=$1
 	trace_path=$2
 
-	echo -n "Creating lttng session $sess_name in $trace_path"
+	echo -n "Creating lttng session $sess_name in $trace_path "
 	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
 	if [ $? -eq 1 ]; then
 		echo -e "\e[1;31mFAILED\e[0m"
@@ -232,3 +307,25 @@ function trace_matches ()
 		return 0
 	fi
 }
+
+function validate_trace
+{
+	event_name=$1
+	trace_path=$2
+
+	which $BABELTRACE_BIN >/dev/null
+	if [ $? -eq 1 ]; then
+		echo "Babeltrace binary not found. Skipping trace matches"
+		return 0
+	fi
+
+	echo -n "Validating trace for event $event_name... "
+	traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $event_name | wc -l)
+	if [ $traced -eq 0 ]; then
+		echo -e "\e[1;31mFAILED\e[0m"
+		return 1
+	else
+		echo -e "\e[1;32mOK\e[0m"
+		return 0
+	fi
+}