Test fix: ignore stderr at every step of randstring

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

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index d08d6b23cf3164476975e2959172a48cd106f7aa..3964e3b12820901957d68f1bf1bbe91497a99b88 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -33,6 +33,12 @@ KERNEL_PATCHLEVEL_VERSION=27
 # systems. Specialized tests should test those corner-cases.
 export LTTNG_UST_REGISTER_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
+# its own sessiond if none is running. It also ensures that 'lttng create'
+# fails when no sessiond is running.
+export LTTNG_SESSIOND_PATH="/bin/true"
+
 source $TESTDIR/utils/tap/tap.sh
 
 function print_ok ()
@@ -82,7 +88,17 @@ function validate_kernel_version ()
 function randstring()
 {
        [ "$2" == "0" ] && CHAR="[:alnum:]" || CHAR="[:graph:]"
-       cat /dev/urandom | tr -cd "$CHAR" | head -c ${1:-16}
+       cat /dev/urandom 2>/dev/null | tr -cd "$CHAR" 2>/dev/null | head -c ${1:-16} 2>/dev/null
+       echo
+}
+
+# Return the number of _configured_ CPUs.
+function conf_proc_count()
+{
+       getconf _NPROCESSORS_CONF
+       if [ $? -ne 0 ]; then
+               diag "Failed to get the number of configured CPUs"
+       fi
        echo
 }
 
@@ -269,7 +285,7 @@ function start_lttng_relayd_opt()
 
        DIR=$(readlink -f $TESTDIR)
 
-       if [ -z $(pidof lt-$RELAYD_BIN) ]; then
+       if [ -z $(pgrep --full lt-$RELAYD_BIN) ]; then
                $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
                #$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
                if [ $? -eq 1 ]; then
@@ -301,7 +317,7 @@ function stop_lttng_relayd_opt()
 {
        local withtap=$1
 
-       PID_RELAYD=`pidof lt-$RELAYD_BIN`
+       PID_RELAYD=`pgrep --full lt-$RELAYD_BIN`
 
        if [ $withtap -eq "1" ]; then
                diag "Killing lttng-relayd (pid: $PID_RELAYD)"
@@ -317,7 +333,7 @@ function stop_lttng_relayd_opt()
        else
                out=1
                while [ -n "$out" ]; do
-                       out=$(pidof lt-$RELAYD_BIN)
+                       out=$(pgrep --full lt-$RELAYD_BIN)
                        sleep 0.5
                done
                if [ $withtap -eq "1" ]; then
@@ -359,10 +375,10 @@ function start_lttng_sessiond_opt()
        : ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
        export LTTNG_SESSION_CONFIG_XSD_PATH
 
-       if [ -z $(pidof lt-$SESSIOND_BIN) ]; then
+       if [ -z $(pgrep --full lt-$SESSIOND_BIN) ]; then
                # Have a load path ?
                if [ -n "$load_path" ]; then
-                       $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$1" --background --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 --load "$load_path" --background --consumerd32-path="$DIR/../src/bin/lttng-consumerd/lttng-consumerd" --consumerd64-path="$DIR/../src/bin/lttng-consumerd/lttng-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"
                fi
@@ -395,7 +411,7 @@ function stop_lttng_sessiond_opt()
                return
        fi
 
-       PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
+       PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN`
 
        if [ -n "$2" ]; then
                kill_opt="$kill_opt -s $signal"
@@ -410,12 +426,12 @@ function stop_lttng_sessiond_opt()
        else
                out=1
                while [ -n "$out" ]; do
-                       out=$(pidof lt-$SESSIOND_BIN)
+                       out=$(pgrep --full lt-$SESSIOND_BIN)
                        sleep 0.5
                done
                out=1
                while [ -n "$out" ]; do
-                       out=$(pidof $CONSUMERD_BIN)
+                       out=$(pgrep --full $CONSUMERD_BIN)
                        sleep 0.5
                done
                if [ $withtap -eq "1" ]; then
@@ -440,7 +456,7 @@ function stop_lttng_consumerd_opt()
        local signal=$2
        local kill_opt=""
 
-       PID_CONSUMERD=`pidof $CONSUMERD_BIN`
+       PID_CONSUMERD=`pgrep --full $CONSUMERD_BIN`
 
        if [ -n "$2" ]; then
                kill_opt="$kill_opt -s $signal"
@@ -461,7 +477,7 @@ function stop_lttng_consumerd_opt()
        else
                out=1
                while [ $out -ne 0 ]; do
-                       pid=$(pidof $CONSUMERD_BIN)
+                       pid=$(pgrep --full $CONSUMERD_BIN)
 
                        # If consumerds are still present check their status.
                        # A zombie status qualifies the consumerd as *killed*