Activate streaming tests in make check

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

diff --git a/tests/utils.sh b/tests/utils.sh
index 2d8b46a834b72f6e393cdb89406602f098ff5ad2..1ca298562aeb8afca9b2f9bd29494383fabc4d45 100644 (file)
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -16,6 +16,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 SESSIOND_BIN="lttng-sessiond"
+RELAYD_BIN="lttng-relayd"
 LTTNG_BIN="lttng"
 BABELTRACE_BIN="babeltrace"
 
@@ -39,13 +40,23 @@ function validate_kernel_version ()
        return 1
 }
 
+# Generate a random string 
+#  $1 = number of characters; defaults to 16
+#  $2 = include special characters; 1 = yes, 0 = no; defaults to yes
+function randstring() 
+{
+       [ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]"
+       cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-16}
+       echo
+}
+
 function spawn_sessiond ()
 {
        echo ""
        echo -n "Starting session daemon... "
        validate_kernel_version
        if [ $? -ne 0 ]; then
-               echo -e "\n*** Kernel to old for session daemon tests ***\n"
+               echo -e "\n*** Kernel too old for session daemon tests ***\n"
                return 2
        fi
 
@@ -64,6 +75,67 @@ function spawn_sessiond ()
        return 0
 }
 
+function lttng_enable_kernel_event
+{
+       sess_name=$1
+       event_name=$2
+
+       if [ -z $event_name ]; then
+               # Enable all event if no event name specified
+               $event_name="-a"
+       fi
+
+       echo -n "Enabling kernel event $event_name for session $sess_name"
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -k >/dev/null 2>&1
+       if [ $? -eq 1 ]; then
+               echo -e '\e[1;31mFAILED\e[0m'
+               return 1
+       else
+               echo -e "\e[1;32mOK\e[0m"
+       fi
+}
+
+function lttng_start_relayd
+{
+       local opt="$1"
+
+       echo -e -n "Starting lttng-relayd (opt: $opt)... "
+
+       DIR=$(readlink -f $TESTDIR)
+
+       if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+               $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 &
+               if [ $? -eq 1 ]; then
+                       echo -e "\e[1;31mFAILED\e[0m"
+                       return 1
+               else
+                       echo -e "\e[1;32mOK\e[0m"
+               fi
+       else
+               echo -e "\e[1;32mOK\e[0m"
+       fi
+}
+
+function lttng_stop_relayd
+{
+       PID_RELAYD=`pidof lt-$RELAYD_BIN`
+
+       echo -e -n "Killing lttng-relayd (pid: $PID_RELAYD)... "
+       kill $PID_RELAYD >/dev/null 2>&1
+       if [ $? -eq 1 ]; then
+               echo -e "\e[1;31mFAILED\e[0m"
+               return 1
+       else
+               out=1
+               while [ -n "$out" ]; do
+                       out=$(pidof lt-$RELAYD_BIN)
+                       sleep 0.5
+               done
+               echo -e "\e[1;32mOK\e[0m"
+               return 0
+       fi
+}
+
 function start_sessiond()
 {
        if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
@@ -101,6 +173,11 @@ function stop_sessiond ()
                echo -e "\e[1;31mFAILED\e[0m"
                return 1
        else
+               out=1
+               while [ -n "$out" ]; do
+                       out=$(pidof lt-$SESSIOND_BIN)
+                       sleep 0.5
+               done
                echo -e "\e[1;32mOK\e[0m"
        fi
 }
@@ -110,7 +187,7 @@ function create_lttng_session ()
        sess_name=$1
        trace_path=$2
 
-       echo -n "Creating lttng session $sess_name in $trace_path"
+       echo -n "Creating lttng session $sess_name in $trace_path "
        $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"
@@ -230,3 +307,25 @@ function trace_matches ()
                return 0
        fi
 }
+
+function validate_trace
+{
+       event_name=$1
+       trace_path=$2
+
+       which $BABELTRACE_BIN >/dev/null
+       if [ $? -eq 1 ]; then
+               echo "Babeltrace binary not found. Skipping trace matches"
+               return 0
+       fi
+
+       echo -n "Validating trace for event $event_name... "
+       traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $event_name | wc -l)
+       if [ $traced -eq 0 ]; then
+               echo -e "\e[1;31mFAILED\e[0m"
+               return 1
+       else
+               echo -e "\e[1;32mOK\e[0m"
+               return 0
+       fi
+}