X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fkernel%2Frun-kernel-tests.sh;h=6948e1fa29cca19920ae922fdde52c4ebe28a987;hp=2881c426e38dae64500bf92b9f542154317e691f;hb=fb3268e3029673dbb7c6d43b2dcde5e5f9eec07a;hpb=355f483d1713d1e047ad6256bea039cb693ae38e

diff --git a/tests/kernel/run-kernel-tests.sh b/tests/kernel/run-kernel-tests.sh
index 2881c426e..6948e1fa2 100755
--- a/tests/kernel/run-kernel-tests.sh
+++ b/tests/kernel/run-kernel-tests.sh
@@ -1,28 +1,34 @@
 #!/bin/bash
 
 SESSIOND_BIN="lttng-sessiond"
-TESTDIR=$(dirname $0)/..
+CURDIR=$(dirname $0)
+TESTDIR=$CURDIR/..
 
 source $TESTDIR/utils.sh
 
 tmpdir=`mktemp -d`
-tests=( kernel_event_basic kernel_all_events_basic )
+tests=( $CURDIR/kernel_event_basic $CURDIR/kernel_all_events_basic )
 exit_code=0
 
 function start_tests ()
 {
     for bin in ${tests[@]};
     do
-		start_sessiond
+		if [ ! -e $bin ]; then
+			echo -e "$bin not found, passing"
+			continue
+		fi
+
+		start_lttng_sessiond
 
         ./$bin $tmpdir
         # Test must return 0 to pass.
         if [ $? -ne 0 ]; then
             exit_code=1
-			stop_sessiond
+			stop_lttng_sessiond
             break
         fi
-		stop_sessiond
+		stop_lttng_sessiond
     done
 
 	# Cleaning up
@@ -31,7 +37,7 @@ function start_tests ()
 
 function check_lttng_modules ()
 {
-	local out=`modprobe -l | grep lttng`
+	local out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
 	if [ -z "$out" ]; then
 		echo "LTTng modules not detected. Aborting kernel tests!"
 		echo ""
@@ -40,9 +46,10 @@ function check_lttng_modules ()
 	fi
 }
 
-echo -e "\n---------------------"
-echo -e "Testing Kernel tracer"
-echo -e "---------------------"
+
+TEST_DESC="Testing Kernel tracer"
+
+print_test_banner "$TEST_DESC"
 
 # Detect lttng-modules installed
 check_lttng_modules