Use correct variable in list bash autocompletion

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

diff --git a/tests/utils.sh b/tests/utils.sh
index 352a19837ccd9b5ba07eff98338aba5c571a78dd..01e8eae21b3886c0bd532f0e438610e94e74c8cf 100644 (file)
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/src/bin/bash
 #
 # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
 #
@@ -19,11 +19,37 @@ SESSIOND_BIN="lttng-sessiond"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
 
+# Minimal kernel version supported for session daemon tests
+KERNEL_MAJOR_VERSION=2
+KERNEL_MINOR_VERSION=6
+KERNEL_PATCHLEVEL_VERSION=27
+
+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 start_sessiond ()
 {
+       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/../lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
+               $TESTDIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --daemonize --quiet
                if [ $? -eq 1 ]; then
                        echo -e "\e[1;31mFAILED\e[0m"
                        return 1
@@ -31,6 +57,8 @@ function start_sessiond ()
                        echo -e "\e[1;32mOK\e[0m"
                fi
        fi
+
+       return 0
 }
 
 function stop_sessiond ()
@@ -53,7 +81,7 @@ function create_lttng_session ()
        trace_path=$2
 
        echo -n "Creating lttng session $SESSION_NAME in $TRACE_PATH "
-       $TESTDIR/../lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path >/dev/null 2>&1
        if [ $? -eq 1 ]; then
                echo -e "\e[1;31mFAILED\e[0m"
                return 1
@@ -69,7 +97,7 @@ function enable_ust_lttng_event ()
        event_name=$2
 
        echo -n "Enabling lttng event $event_name for session $sess_name "
-       $TESTDIR/../lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u >/dev/null 2>&1
        if [ $? -eq 1 ]; then
                echo -e '\e[1;31mFAILED\e[0m'
                return 1
@@ -83,7 +111,7 @@ function start_tracing ()
        sess_name=$1
 
        echo -n "Start lttng tracing for session $sess_name "
-       $TESTDIR/../lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
                echo -e '\e[1;31mFAILED\e[0m'
                return 1
@@ -97,7 +125,7 @@ function stop_tracing ()
        sess_name=$1
 
        echo -n "Stop lttng tracing for session $sess_name "
-       $TESTDIR/../lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
                echo -e '\e[1;31mFAILED\e[0m'
                return 1
@@ -111,7 +139,7 @@ function destroy_lttng_session ()
        sess_name=$1
 
        echo -n "Destroy lttng session $sess_name "
-       $TESTDIR/../lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1 
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
                echo -e '\e[1;31mFAILED\e[0m'
                return 1