From: David Goulet <dgoulet@efficios.com>
Date: Tue, 31 Jan 2012 15:47:54 +0000 (-0500)
Subject: Use lttng-consumerd of the code tree for tests
X-Git-Tag: v2.0-pre19~26
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=317eef9339f8620bf3d99972ba2a9196a36060db

Use lttng-consumerd of the code tree for tests

Better use the consumer daemon in tree that we just built and not the
one installed on the system that might be quite old ;)

Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/tests/utils.sh b/tests/utils.sh
index 01e8eae21..55bc9e9d5 100644
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -41,15 +41,16 @@ function validate_kernel_version ()
 
 function start_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"
 		return 2
 	fi
 
-	if [ -z $(pidof $SESSIOND_BIN) ]; then
-		echo -n "Starting session daemon... "
-		$TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
+	if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+		$TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet --consumerd32-path="$(pwd)/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$(pwd)/../src/bin/lttng-consumerd/lttng-consumerd"
 		if [ $? -eq 1 ]; then
 			echo -e "\e[1;31mFAILED\e[0m"
 			return 1
@@ -154,6 +155,12 @@ function trace_matches ()
 	nr_iter=$2
 	trace_path=$3
 
+	which $BABELTRACE_BIN >/dev/null
+	if [ $? -eq 1 ]; then
+		echo "Babeltrace binary not found. Skipping trace matches"
+		return 0
+	fi
+
 	echo -n "Looking for $nr_iter $event_name in $trace_path "
 
 	count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)