Tests: add consumer testpoint to pause data consumption

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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index c56a8aa2855d5c63bce73d5fc71514553d389fed..100f4fd2a1fc02566518168a2d2cd57447d71061 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1,5 +1,3 @@
-#!/src/bin/bash
-#
 # Copyright (C) - 2012 David Goulet <dgoulet@efficios.com>
 #
 # This library is free software; you can redistribute it and/or modify it under
@@ -35,10 +33,12 @@ KERNEL_MAJOR_VERSION=2
 KERNEL_MINOR_VERSION=6
 KERNEL_PATCHLEVEL_VERSION=27
 
-# We set the default UST register timeout to "wait forever", so that
-# basic tests don't have to worry about hitting timeouts on busy
-# systems. Specialized tests should test those corner-cases.
+# We set the default UST register timeout and network and app socket timeout to
+# "wait forever", so that basic tests don't have to worry about hitting
+# timeouts on busy systems. Specialized tests should test those corner-cases.
 export LTTNG_UST_REGISTER_TIMEOUT=-1
+export LTTNG_NETWORK_SOCKET_TIMEOUT=-1
+export LTTNG_APP_SOCKET_TIMEOUT=-1
 
 # We set the default lttng-sessiond path to /bin/true to prevent the spawning
 # of a daemonized sessiond. This is necessary since 'lttng create' will spawn
@@ -384,27 +384,50 @@ function start_lttng_sessiond_opt()
        local withtap=$1
        local load_path=$2
 
+       local env_vars=""
+       local consumerd=""
+       local long_bit_value=$(getconf LONG_BIT)
+
        if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then
                # Env variable requested no session daemon
                return
        fi
 
+       DIR=$(readlink -f $TESTDIR)
+
+       # Get long_bit value for 32/64 consumerd
+       case "$long_bit_value" in
+               32)
+                       consumerd="--consumerd32-path=$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+                       ;;
+               64)
+                       consumerd="--consumerd64-path=$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+                       ;;
+               *)
+                       return
+                       ;;
+       esac
+
+       # Check for env. variable. Allow the use of LD_PRELOAD etc.
+       if [[ "x${LTTNG_SESSIOND_ENV_VARS}" != "x" ]]; then
+               env_vars=${LTTNG_SESSIOND_ENV_VARS}
+       fi
+
        validate_kernel_version
        if [ $? -ne 0 ]; then
            fail "Start session daemon"
            BAIL_OUT "*** Kernel too old for session daemon tests ***"
        fi
 
-       DIR=$(readlink -f $TESTDIR)
        : ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
        export LTTNG_SESSION_CONFIG_XSD_PATH
 
        if [ -z $(pgrep ${SESSIOND_MATCH}) ]; then
                # Have a load path ?
                if [ -n "$load_path" ]; then
-                       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+                       env $env_vars $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background $consumerd
                else
-                       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd"
+                       env $env_vars $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background $consumerd
                fi
                #$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background --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
                status=$?
@@ -1137,10 +1160,27 @@ function lttng_save()
 
 function lttng_load()
 {
-       local opts=$1
+       local expected_to_fail=$1
+       local opts=$2
 
        $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
-       ok $? "Load command with opts: $opts"
+       ret=$?
+       if [[ $expected_to_fail -eq "1" ]]; then
+               test $ret -ne "0"
+               ok $? "Load command failed as expected with opts: $opts"
+       else
+               ok $ret "Load command with opts: $opts"
+       fi
+}
+
+function lttng_load_ok()
+{
+       lttng_load 0 "$@"
+}
+
+function lttng_load_fail()
+{
+       lttng_load 1 "$@"
 }
 
 function lttng_track()