Fix tests when lttng-ust is disabled

[lttng-tools.git] / tests / utils.sh

diff --git a/tests/utils.sh b/tests/utils.sh
index 1d8f2ebd0b73b823ecc9884aba202616780af3b8..f0a2e25dd7fde160e603f57f8b16b65c1fae6428 100644 (file)
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -19,11 +19,42 @@ SESSIOND_BIN="lttng-sessiond"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
 
-function start_sessiond ()
+# Minimal kernel version supported for session daemon tests
+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'))
+       if [ ${kern_version[0]} -gt $KERNEL_MAJOR_VERSION ]; then
+               return 0
+       fi
+       if [ ${kern_version[1]} -gt $KERNEL_MINOR_VERSION ]; then
+               return 0
+       fi
+       if [ ${kern_version[2]} -ge $KERNEL_PATCHLEVEL_VERSION ]; then
+               return 0
+       fi
+       return 1
+}
+
+function spawn_sessiond ()
 {
-       if [ -z $(pidof $SESSIOND_BIN) ]; then
-               echo -n "Starting session daemon... "
-               $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
+       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
+
+       DIR=$(realpath $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"
                if [ $? -eq 1 ]; then
                        echo -e "\e[1;31mFAILED\e[0m"
                        return 1
@@ -31,10 +62,39 @@ function start_sessiond ()
                        echo -e "\e[1;32mOK\e[0m"
                fi
        fi
+
+       return 0
+}
+
+function start_sessiond()
+{
+       if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
+               # Env variable requested no session daemon
+               return
+       fi
+
+       spawn_sessiond
+       out=$?
+       if [ $out -eq 2 ]; then
+               # Kernel version is not compatible.
+               exit 0
+       elif [ $out -ne 0 ]; then
+               echo "NOT bad $?"
+               exit 1
+       fi
+
+       # Simply wait for the session daemon bootstrap
+       echo "Waiting for the session daemon to bootstrap (2 secs)"
+       sleep 2
 }
 
 function stop_sessiond ()
 {
+       if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
+               # Env variable requested no session daemon
+               return
+       fi
+
        PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
 
        echo -e -n "Killing session daemon... "
@@ -126,6 +186,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)