X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fkernel%2Frun-kernel-tests.sh;h=6948e1fa29cca19920ae922fdde52c4ebe28a987;hb=ffadb7d34f0cfd59405e075d84dc10512e832446;hp=f77c43758091d7cf683f08f0250febc8d0def7f0;hpb=2e6a03f64e7643a9bcca11ed2301e4ac2ac6ef7b;p=lttng-tools.git diff --git a/tests/kernel/run-kernel-tests.sh b/tests/kernel/run-kernel-tests.sh index f77c43758..6948e1fa2 100755 --- a/tests/kernel/run-kernel-tests.sh +++ b/tests/kernel/run-kernel-tests.sh @@ -19,16 +19,16 @@ function start_tests () continue fi - start_sessiond + 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 @@ -37,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 "" @@ -46,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