X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=567929aa08840f79e251855500b74f7584f36331;hp=a0c9940ac90bcff283863f286b1fce03fa326866;hb=434f80687923fbce645b5b31b44876229559808c;hpb=4c80129b997f0fde87c1355ebf2c44fda8fdb13c diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index a0c9940ac..567929aa0 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -1,5 +1,3 @@ -#!/src/bin/bash -# # Copyright (C) - 2012 David Goulet # # This library is free software; you can redistribute it and/or modify it under @@ -16,8 +14,15 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA SESSIOND_BIN="lttng-sessiond" +SESSIOND_MATCH=".*lttng-sess.*" +SESSIOND_PIDS="" +RUNAS_BIN="lttng-runas" +RUNAS_MATCH=".*lttng-runas.*" CONSUMERD_BIN="lttng-consumerd" +CONSUMERD_MATCH=".*lttng-consumerd.*" RELAYD_BIN="lttng-relayd" +RELAYD_MATCH=".*lttng-relayd.*" +RELAYD_PIDS="" LTTNG_BIN="lttng" BABELTRACE_BIN="babeltrace" OUTPUT_DEST=/dev/null @@ -28,13 +33,37 @@ 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 +# 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 full_cleanup () +{ + if [ -n "${SESSIOND_PIDS}" ] || [ -n "${RELAYD_PIDS}" ]; then + kill -9 ${SESSIOND_PIDS} ${RELAYD_PIDS} > /dev/null 2>&1 + fi + + # Disable trap for SIGTERM since the following kill to the + # pidgroup will be SIGTERM. Otherwise it loops. + # The '-' before the pid number ($$) indicates 'kill' to signal the + # whole process group. + trap - SIGTERM && kill -- -$$ +} + + +trap full_cleanup SIGINT SIGTERM + function print_ok () { # Check if we are a terminal @@ -82,7 +111,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 } @@ -194,7 +233,7 @@ function lttng_disable_kernel_syscall() ret=$? if [[ $expected_to_fail -eq "1" ]]; then test $ret -ne "0" - ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name fail as expected" + ok $? "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name failed as expected" else ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name" fi @@ -220,7 +259,7 @@ function lttng_enable_kernel_channel() ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected failure on kernel channel creation $channel_name in $sess_name" + ok $? "Enable channel $channel_name for session $sess_name failed as expected" else ok $ret "Enable channel $channel_name for session $sess_name" fi @@ -246,9 +285,9 @@ function lttng_disable_kernel_channel() ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected failure on kernel channel creation $channel_name in $sess_name" + ok $? "Disable channel $channel_name for session $sess_name failed as expected" else - ok $ret "disable channel $channel_name for session $sess_name" + ok $ret "Disable channel $channel_name for session $sess_name" fi } @@ -269,7 +308,7 @@ function start_lttng_relayd_opt() DIR=$(readlink -f $TESTDIR) - if [ -z $(pidof lt-$RELAYD_BIN) ]; then + if [ -z $(pgrep $RELAYD_MATCH) ]; 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 @@ -285,6 +324,8 @@ function start_lttng_relayd_opt() else pass "Start lttng-relayd (opt: $opt)" fi + + RELAYD_PIDS=$(pgrep $RELAYD_MATCH) } function start_lttng_relayd() @@ -301,12 +342,10 @@ function stop_lttng_relayd_opt() { local withtap=$1 - PID_RELAYD=`pidof lt-$RELAYD_BIN` - if [ $withtap -eq "1" ]; then - diag "Killing lttng-relayd (pid: $PID_RELAYD)" + diag "Killing lttng-relayd (pid: $RELAYD_PIDS)" fi - kill $PID_RELAYD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + kill $RELAYD_PIDS 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST retval=$? if [ $? -eq 1 ]; then @@ -317,13 +356,14 @@ function stop_lttng_relayd_opt() else out=1 while [ -n "$out" ]; do - out=$(pidof lt-$RELAYD_BIN) + out=$(pgrep $RELAYD_MATCH) sleep 0.5 done if [ $withtap -eq "1" ]; then pass "Kill relay daemon" fi fi + RELAYD_PIDS="" return $retval } @@ -344,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 $(pidof lt-$SESSIOND_BIN) ]; then + if [ -z $(pgrep ${SESSIOND_MATCH}) ]; 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" + 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=$? @@ -372,6 +435,7 @@ function start_lttng_sessiond_opt() ok $status "Start session daemon" fi fi + SESSIOND_PIDS=$(pgrep $SESSIOND_MATCH) } function start_lttng_sessiond() @@ -395,13 +459,15 @@ function stop_lttng_sessiond_opt() return fi - PID_SESSIOND=`pidof lt-$SESSIOND_BIN` + local pids="${SESSIOND_PIDS} $(pgrep $RUNAS_MATCH)" if [ -n "$2" ]; then kill_opt="$kill_opt -s $signal" fi - - kill $kill_opt $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + if [ $withtap -eq "1" ]; then + diag "Killing $SESSIOND_BIN and lt-$SESSIOND_BIN pids: $(echo $pids | tr '\n' ' ')" + fi + kill $kill_opt $pids 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST if [ $? -eq 1 ]; then if [ $withtap -eq "1" ]; then @@ -410,14 +476,16 @@ function stop_lttng_sessiond_opt() else out=1 while [ -n "$out" ]; do - out=$(pidof lt-$SESSIOND_BIN) + out=$(pgrep ${SESSIOND_MATCH}) sleep 0.5 done out=1 while [ -n "$out" ]; do - out=$(pidof $CONSUMERD_BIN) + out=$(pgrep $CONSUMERD_MATCH) sleep 0.5 done + + SESSIOND_PIDS="" if [ $withtap -eq "1" ]; then pass "Kill session daemon" fi @@ -434,20 +502,76 @@ function stop_lttng_sessiond_notap() stop_lttng_sessiond_opt 0 "$@" } +function sigstop_lttng_sessiond_opt() +{ + local withtap=$1 + local signal=SIGSTOP + local kill_opt="" + + if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then + # Env variable requested no session daemon + return + fi + + PID_SESSIOND="$(pgrep ${SESSIOND_MATCH}) $(pgrep $RUNAS_MATCH)" + + kill_opt="$kill_opt -s $signal" + + if [ $withtap -eq "1" ]; then + diag "Sending SIGSTOP to lt-$SESSIOND_BIN and $SESSIOND_BIN pids: $(echo $PID_SESSIOND | tr '\n' ' ')" + fi + kill $kill_opt $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + + if [ $? -eq 1 ]; then + if [ $withtap -eq "1" ]; then + fail "Sending SIGSTOP to session daemon" + fi + else + out=1 + while [ $out -ne 0 ]; do + pid=$(pgrep $SESSIOND_MATCH) + + # Wait until state becomes stopped for session + # daemon(s). + out=0 + for sessiond_pid in $pid; do + state=$(ps -p $sessiond_pid -o state= ) + if [[ -n "$state" && "$state" != "T" ]]; then + out=1 + fi + done + sleep 0.5 + done + if [ $withtap -eq "1" ]; then + pass "Sending SIGSTOP to session daemon" + fi + fi +} + +function sigstop_lttng_sessiond() +{ + sigstop_lttng_sessiond_opt 1 "$@" +} + +function sigstop_lttng_sessiond_notap() +{ + sigstop_lttng_sessiond_opt 0 "$@" +} + function stop_lttng_consumerd_opt() { local withtap=$1 local signal=$2 local kill_opt="" - PID_CONSUMERD=`pidof $CONSUMERD_BIN` + PID_CONSUMERD=$(pgrep $CONSUMERD_MATCH) if [ -n "$2" ]; then kill_opt="$kill_opt -s $signal" fi if [ $withtap -eq "1" ]; then - diag "Killing lttng-consumerd (pid: $PID_CONSUMERD)" + diag "Killing $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')" fi kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST retval=$? @@ -461,7 +585,7 @@ function stop_lttng_consumerd_opt() else out=1 while [ $out -ne 0 ]; do - pid=$(pidof $CONSUMERD_BIN) + pid=$(pgrep $CONSUMERD_MATCH) # If consumerds are still present check their status. # A zombie status qualifies the consumerd as *killed* @@ -491,6 +615,61 @@ function stop_lttng_consumerd_notap() stop_lttng_consumerd_opt 0 "$@" } +function sigstop_lttng_consumerd_opt() +{ + local withtap=$1 + local signal=SIGSTOP + local kill_opt="" + + PID_CONSUMERD=$(pgrep $CONSUMERD_MATCH) + + kill_opt="$kill_opt -s $signal" + + if [ $withtap -eq "1" ]; then + diag "Sending SIGSTOP to $CONSUMERD_BIN pids: $(echo $PID_CONSUMERD | tr '\n' ' ')" + fi + kill $kill_opt $PID_CONSUMERD 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + retval=$? + set +x + + if [ $? -eq 1 ]; then + if [ $withtap -eq "1" ]; then + fail "Sending SIGSTOP to consumer daemon" + fi + return 1 + else + out=1 + while [ $out -ne 0 ]; do + pid=$(pgrep $CONSUMERD_MATCH) + + # Wait until state becomes stopped for all + # consumers. + out=0 + for consumer_pid in $pid; do + state=$(ps -p $consumer_pid -o state= ) + if [[ -n "$state" && "$state" != "T" ]]; then + out=1 + fi + done + sleep 0.5 + done + if [ $withtap -eq "1" ]; then + pass "Sending SIGSTOP to consumer daemon" + fi + fi + return $retval +} + +function sigstop_lttng_consumerd() +{ + sigstop_lttng_consumerd_opt 1 "$@" +} + +function sigstop_lttng_consumerd_notap() +{ + sigstop_lttng_consumerd_opt 0 "$@" +} + function list_lttng_with_opts () { local opts=$1 @@ -508,57 +687,81 @@ function create_lttng_session_no_output () function create_lttng_session () { - local expected_to_fail=$1 - local sess_name=$2 - local trace_path=$3 - local opt=$4 + local withtap=$1 + local expected_to_fail=$2 + local sess_name=$3 + local trace_path=$4 + local opt=$5 $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST ret=$? - if [[ $expected_to_fail -eq "1" ]]; then + if [ $expected_to_fail -eq "1" ]; then test "$ret" -ne "0" - ok $? "Expected fail on session creation $sess_name in $trace_path" + ret=$? + if [ $withtap -eq "1" ]; then + ok $ret "Create session $sess_name in $trace_path failed as expected" + fi else - ok $ret "Create session $sess_name in $trace_path" + if [ $withtap -eq "1" ]; then + ok $ret "Create session $sess_name in $trace_path" + fi fi + return $ret } function create_lttng_session_ok () { - create_lttng_session 0 "$@" + create_lttng_session 1 0 "$@" } function create_lttng_session_fail () { - create_lttng_session 1 "$@" + create_lttng_session 1 1 "$@" +} + +function create_lttng_session_notap () +{ + create_lttng_session 0 0 "$@" } function enable_ust_lttng_channel () { - local expect_fail=$1 - local sess_name=$2 - local channel_name=$3 - local opt=$4 + local withtap=$1 + local expected_to_fail=$2 + local sess_name=$3 + local channel_name=$4 + local opt=$5 $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST ret=$? - if [[ $expect_fail -eq "1" ]]; then + if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on ust channel creation $channel_name in $sess_name" + ret=$? + if [ $withtap -eq "1" ]; then + ok $ret "Enable channel $channel_name for session $sess_name failed as expected" + fi else - ok $ret "Enable channel $channel_name for session $sess_name" + if [ $withtap -eq "1" ]; then + ok $ret "Enable channel $channel_name for session $sess_name" + fi fi + return $ret } function enable_ust_lttng_channel_ok () { - enable_ust_lttng_channel 0 "$@" + enable_ust_lttng_channel 1 0 "$@" } function enable_ust_lttng_channel_fail () { - enable_ust_lttng_channel 1 "$@" + enable_ust_lttng_channel 1 1 "$@" +} + +function enable_ust_lttng_channel_notap () +{ + enable_ust_lttng_channel 0 0 "$@" } function disable_ust_lttng_channel() @@ -579,6 +782,24 @@ function enable_lttng_mmap_overwrite_kernel_channel() ok $? "Enable channel $channel_name for session $sess_name" } +function enable_lttng_mmap_discard_small_kernel_channel() +{ + local sess_name=$1 + local channel_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --discard --subbuf-size=$(getconf PAGE_SIZE) --num-subbuf=2 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ok $? "Enable small discard channel $channel_name for session $sess_name" +} + +function enable_lttng_mmap_overwrite_small_kernel_channel() +{ + local sess_name=$1 + local channel_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite --subbuf-size=$(getconf PAGE_SIZE) --num-subbuf=2 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ok $? "Enable small discard channel $channel_name for session $sess_name" +} + function enable_lttng_mmap_overwrite_ust_channel() { local sess_name=$1 @@ -590,10 +811,11 @@ function enable_lttng_mmap_overwrite_ust_channel() function enable_ust_lttng_event () { - local expected_to_fail=$1 - local sess_name=$2 - local event_name="$3" - local channel_name=$4 + local withtap=$1 + local expected_to_fail=$2 + local sess_name=$3 + local event_name="$4" + local channel_name=$5 if [ -z $channel_name ]; then # default channel if none specified @@ -606,20 +828,31 @@ function enable_ust_lttng_event () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test $ret -ne "0" - ok $? "Enable ust event $event_name for session $session_name on channel $channel_name failed as expected" + ret=$? + if [[ $withtap -eq "1" ]]; then + ok $ret "Enable ust event $event_name for session $session_name failed as expected" + fi else - ok $ret "Enable event $event_name for session $sess_name" + if [[ $withtap -eq "1" ]]; then + ok $ret "Enable ust event $event_name for session $sess_name" + fi fi + return $ret } function enable_ust_lttng_event_ok () { - enable_ust_lttng_event 0 "$@" + enable_ust_lttng_event 1 0 "$@" } function enable_ust_lttng_event_fail () { - enable_ust_lttng_event 1 "$@" + enable_ust_lttng_event 1 1 "$@" +} + +function enable_ust_lttng_event_notap () +{ + enable_ust_lttng_event 0 0 "$@" } function enable_jul_lttng_event() @@ -810,7 +1043,7 @@ function start_lttng_tracing () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on start tracing for session: $sess_name" + ok $? "Start tracing for session $sess_name failed as expected" else ok $ret "Start tracing for session $sess_name" fi @@ -835,7 +1068,7 @@ function stop_lttng_tracing () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on stop tracing for session: $sess_name" + ok $? "Stop lttng tracing for session $sess_name failed as expected" else ok $ret "Stop lttng tracing for session $sess_name" fi @@ -860,7 +1093,7 @@ function destroy_lttng_session () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on session deletion $sess_name" + ok $? "Destroy session $sess_name failed as expected" else ok $ret "Destroy session $sess_name" fi @@ -894,7 +1127,7 @@ function lttng_snapshot_add_output () ret=$? if [[ $expected_to_fail -eq 1 ]]; then test "$ret" -ne "0" - ok $? "Failed to add a snapshot output file://$trace_path as expected" + ok $? "Added snapshot output file://$trace_path failed as expected" else ok $ret "Added snapshot output file://$trace_path" fi @@ -920,7 +1153,7 @@ function lttng_snapshot_del_output () ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expect fail on deletion of snapshot output id $id" + ok $? "Deleted snapshot output id $id failed as expected" else ok $ret "Deleted snapshot output id $id" fi @@ -958,15 +1191,32 @@ function lttng_save() local opts=$2 $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Session successfully saved" + ok $? "Session saved" } 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 successful" + 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() @@ -979,7 +1229,7 @@ function lttng_track() test $ret -ne "0" ok $? "Track command failed as expected with opts: $opts" else - ok $ret "Track command success as expected with opts: $opts" + ok $ret "Track command with opts: $opts" fi } @@ -1003,7 +1253,7 @@ function lttng_untrack() test $ret -ne "0" ok $? "Untrack command failed as expected with opts: $opts" else - ok $ret "Untrack command success as expected with opts: $opts" + ok $ret "Untrack command with opts: $opts" fi } @@ -1017,6 +1267,44 @@ function lttng_untrack_fail() lttng_untrack 1 "$@" } +function add_context_lttng() +{ + local expected_to_fail="$1" + local domain="$2" + local session_name="$3" + local channel_name="$4" + local type="$5" + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN add-context -s $session_name -c $channel_name -t $type $domain 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test $ret -ne "0" + ok $? "Add context command failed as expected for type: $type" + else + ok $ret "Add context command for type: $type" + fi +} + +function add_context_ust_ok() +{ + add_context_lttng 0 -u "$@" +} + +function add_context_ust_fail() +{ + add_context_lttng 1 -u "$@" +} + +function add_context_kernel_ok() +{ + add_context_lttng 0 -k "$@" +} + +function add_context_kernel_fail() +{ + add_context_lttng 1 -k "$@" +} + function trace_matches () { local event_name=$1 @@ -1030,7 +1318,7 @@ function trace_matches () if [ "$count" -ne "$nr_iter" ]; then fail "Trace match" - diag "$count events found in trace" + diag "$count matching events found in trace" else pass "Trace match" fi @@ -1082,6 +1370,47 @@ function validate_trace return $ret } +function validate_trace_count +{ + local event_name=$1 + local trace_path=$2 + local expected_count=$3 + + which $BABELTRACE_BIN >/dev/null + if [ $? -ne 0 ]; then + skip 0 "Babeltrace binary not found. Skipping trace validation" + fi + + cnt=0 + OLDIFS=$IFS + IFS="," + for i in $event_name; do + traced=$($BABELTRACE_BIN $trace_path 2>/dev/null | grep $i | wc -l) + if [ "$traced" -ne 0 ]; then + pass "Validate trace for event $i, $traced events" + else + fail "Validate trace for event $i" + diag "Found $traced occurences of $i" + fi + cnt=$(($cnt + $traced)) + done + IFS=$OLDIFS + test $cnt -eq $expected_count + ok $? "Read a total of $cnt events, expected $expected_count" +} + +function trace_first_line +{ + local trace_path=$1 + + which $BABELTRACE_BIN >/dev/null + if [ $? -ne 0 ]; then + skip 0 "Babeltrace binary not found. Skipping trace validation" + fi + + $BABELTRACE_BIN $trace_path 2>/dev/null | head -n 1 +} + function validate_trace_exp() { local event_exp=$1 @@ -1141,3 +1470,62 @@ function validate_trace_empty() ret=$? return $ret } + +function regenerate_metadata () +{ + local expected_to_fail=$1 + local sess_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN regenerate metadata -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test "$ret" -ne "0" + ok $? "Expected fail on regenerate metadata $sess_name" + else + ok $ret "Metadata regenerate $sess_name" + fi +} + +function regenerate_metadata_ok () +{ + regenerate_metadata 0 "$@" +} + +function regenerate_metadata_fail () +{ + regenerate_metadata 1 "$@" +} + +function regenerate_statedump () +{ + local expected_to_fail=$1 + local sess_name=$2 + + $TESTDIR/../src/bin/lttng/$LTTNG_BIN regenerate statedump -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + ret=$? + if [[ $expected_to_fail -eq "1" ]]; then + test "$ret" -ne "0" + ok $? "Expected fail on regenerate statedump $sess_name" + else + ok $ret "Metadata regenerate $sess_name" + fi +} + +function regenerate_statedump_ok () +{ + regenerate_statedump 0 "$@" +} + +function regenerate_statedump_fail () +{ + regenerate_statedump 1 "$@" +} + +function destructive_tests_enabled () +{ + if [ ${LTTNG_ENABLE_DESTRUCTIVE_TESTS} = "will-break-my-system" ]; then + return 0 + else + return 1 + fi +}