projects / lttng-tools.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Change the UST event hash table match function
[lttng-tools.git] / tests / utils.sh
diff --git a/tests/utils.sh b/tests/utils.sh
index e1fd5cb91403a2fbfc41d51323594dcfc51ef663..23b2dfd0737c8a3d401939ca66218d06b1f5961b 100644 (file)
--- a/tests/utils.sh
+++ b/tests/utils.sh
@@ -25,6 +25,38 @@ KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
+function print_ok ()
+{
+       # Check if we are a terminal
+       if [ -t 1 ]; then
+               echo -e "\e[1;32mOK\e[0m"
+       else
+               echo -e "OK"
+       fi
+}
+
+function print_fail ()
+{
+       # Check if we are a terminal
+       if [ -t 1 ]; then
+               echo -e "\e[1;31mFAIL\e[0m"
+       else
+               echo -e "FAIL"
+       fi
+}
+
+function print_test_banner ()
+{
+       desc="$1"
+
+       count=$((${#desc}+2))
+       str=$(printf "%${count}s");
+       echo -e "\n"
+       echo -e ${str// /-}
+       echo -e " $desc "
+       echo -e ${str// /-}
+}
+
 function validate_kernel_version ()
 {
        kern_version=($(uname -r | awk -F. '{ printf("%d.%d.%d\n",$1,$2,$3); }' | tr '.' '\n'))
@@ -64,11 +96,12 @@ function spawn_sessiond ()
 
        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"
+               #$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --verbose-consumer >>/tmp/sessiond.log 2>&1 &
                if [ $? -eq 1 ]; then
-                       echo -e "\e[1;31mFAILED\e[0m"
+                       print_fail
                        return 1
                else
-                       echo -e "\e[1;32mOK\e[0m"
+                       print_ok
                fi
        fi
 
@@ -88,39 +121,43 @@ function lttng_enable_kernel_event
        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'
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
-function lttng_start_relayd
+function start_lttng_relayd
 {
-       echo -e -n "Starting lttng-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 >/dev/null 2>&1 &
+               $DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt >/dev/null 2>&1 &
+               #$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
                if [ $? -eq 1 ]; then
-                       echo -e "\e[1;31mFAILED\e[0m"
+                       print_fail
                        return 1
                else
-                       echo -e "\e[1;32mOK\e[0m"
+                       print_ok
                fi
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
-function lttng_stop_relayd
+function stop_lttng_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"
+               print_fail
                return 1
        else
                out=1
@@ -128,12 +165,12 @@ function lttng_stop_relayd
                        out=$(pidof lt-$RELAYD_BIN)
                        sleep 0.5
                done
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
                return 0
        fi
 }
 
-function start_sessiond()
+function start_lttng_sessiond()
 {
        if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
                # Env variable requested no session daemon
@@ -155,7 +192,7 @@ function start_sessiond()
        sleep 2
 }
 
-function stop_sessiond ()
+function stop_lttng_sessiond ()
 {
        if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
                # Env variable requested no session daemon
@@ -167,7 +204,7 @@ function stop_sessiond ()
        echo -e -n "Killing session daemon... "
        kill $PID_SESSIOND >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e "\e[1;31mFAILED\e[0m"
+               print_fail
                return 1
        else
                out=1
@@ -175,7 +212,7 @@ function stop_sessiond ()
                        out=$(pidof lt-$SESSIOND_BIN)
                        sleep 0.5
                done
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
@@ -187,10 +224,10 @@ function create_lttng_session ()
        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"
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
@@ -202,10 +239,10 @@ function enable_lttng_channel()
        echo -n "Enabling lttng channel $channel_name for session $sess_name"
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel $channel_name -s $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e "\e[1;31mFAILED\e[0m"
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
@@ -217,53 +254,119 @@ function disable_lttng_channel()
        echo -n "Disabling lttng channel $channel_name for session $sess_name"
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel $channel_name -s $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e "\e[1;31mFAILED\e[0m"
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
 function enable_ust_lttng_event ()
 {
        sess_name=$1
-       event_name=$2
+       event_name="$2"
 
        echo -n "Enabling lttng event $event_name for session $sess_name "
-       $TESTDIR/../src/bin/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'
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
+       fi
+}
+
+function enable_ust_lttng_event_filter()
+{
+       sess_name="$1"
+       event_name="$2"
+       filter="$3"
+       echo -n "Enabling lttng event with filtering "
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --filter "$filter" 2>&1 >/dev/null
+       if [ $? -eq 0 ]; then
+               print_ok
+               return 0
+       else
+               print_fail
+               return 1
+       fi
+}
+
+function enable_ust_lttng_event_loglevel()
+{
+       sess_name="$1"
+       event_name="$2"
+       loglevel="$3"
+       echo -n "Enabling lttng event $event_name with loglevel $loglevel"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --loglevel $loglevel 2>&1 >/dev/null
+       if [ $? -eq 0 ]; then
+               print_ok
+               return 0
+       else
+               print_fail
+               return 1
+       fi
+}
+
+function enable_ust_lttng_event_loglevel_only()
+{
+       sess_name="$1"
+       event_name="$2"
+       loglevel="$3"
+       echo -n "Enabling lttng event $event_name with loglevel-only $loglevel"
+
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event $event_name -s $sess_name -u --loglevel-only $loglevel 2>&1 >/dev/null
+       if [ $? -eq 0 ]; then
+               print_ok
+               return 0
+       else
+               print_fail
+               return 1
        fi
 }
 
-function start_tracing ()
+function disable_ust_lttng_event ()
+{
+       sess_name=$1
+       event_name=$2
+
+       echo -n "Disabling lttng event $event_name for session $sess_name "
+       $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event $event_name -s $sess_name -u >/dev/null 2>&1
+       if [ $? -eq 1 ]; then
+               print_fail
+               return 1
+       else
+               print_ok
+       fi
+}
+
+function start_lttng_tracing ()
 {
        sess_name=$1
 
        echo -n "Start lttng tracing for session $sess_name "
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e '\e[1;31mFAILED\e[0m'
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
-function stop_tracing ()
+function stop_lttng_tracing ()
 {
        sess_name=$1
 
        echo -n "Stop lttng tracing for session $sess_name "
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e '\e[1;31mFAILED\e[0m'
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
@@ -274,10 +377,10 @@ function destroy_lttng_session ()
        echo -n "Destroy lttng session $sess_name "
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name >/dev/null 2>&1
        if [ $? -eq 1 ]; then
-               echo -e '\e[1;31mFAILED\e[0m'
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
        fi
 }
 
@@ -297,10 +400,12 @@ function trace_matches ()
 
        count=$($BABELTRACE_BIN $trace_path | grep $event_name | wc -l)
        if [ "$count" -ne "$nr_iter" ]; then
-               echo -e "$count found in trace \e[1;31mFAILED\e[0m"
+               echo -n "$count found in trace "
+               print_fail
                return 1
        else
-               echo -e "Trace is coherent \e[1;32mOK\e[0m"
+               echo -n "Trace is coherent "
+               print_ok
                return 0
        fi
 }
@@ -319,10 +424,10 @@ function validate_trace
        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"
+               print_fail
                return 1
        else
-               echo -e "\e[1;32mOK\e[0m"
+               print_ok
                return 0
        fi
 }
LTTng 2.0 tools and control repository
This page took 0.026642 seconds and 4 git commands to generate.