Tests: Cleanup redundant code and use printing helper functions

[lttng-tools.git] / tests / kernel / run-kernel-tests.sh

diff --git a/tests/kernel/run-kernel-tests.sh b/tests/kernel/run-kernel-tests.sh
index 2881c426e38dae64500bf92b9f542154317e691f..f89cd7b260d2a1fccaf9669ae8eebbda6fda8dbb 100755 (executable)
--- a/tests/kernel/run-kernel-tests.sh
+++ b/tests/kernel/run-kernel-tests.sh
@@ -1,18 +1,24 @@
 #!/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
+               if [ ! -e $bin ]; then
+                       echo -e "$bin not found, passing"
+                       continue
+               fi
+
                start_sessiond
 
         ./$bin $tmpdir
@@ -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