X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Futils%2Futils.sh;h=35207929eca6afd63394c63a7f7d556c579f3489;hp=d466ee681b2727a00aab265df611deef2a513e15;hb=db7b260cfaefc5c9065650ac21bfe21c2e401192;hpb=4a180d9f41bd4d369745c6e6f5066a6c281cca1c diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh index d466ee681..35207929e 100644 --- a/tests/utils/utils.sh +++ b/tests/utils/utils.sh @@ -194,7 +194,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 +220,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 +246,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 +269,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 +301,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 +317,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,7 +359,7 @@ 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" @@ -387,15 +387,21 @@ function start_lttng_sessiond_notap() function stop_lttng_sessiond_opt() { local withtap=$1 + local signal=$2 + local kill_opt="" if [ -n $TEST_NO_SESSIOND ] && [ "$TEST_NO_SESSIOND" == "1" ]; then # Env variable requested no session daemon return fi - PID_SESSIOND=`pidof lt-$SESSIOND_BIN` + PID_SESSIOND=`pgrep --full lt-$SESSIOND_BIN` - kill $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + if [ -n "$2" ]; then + kill_opt="$kill_opt -s $signal" + fi + + kill $kill_opt $PID_SESSIOND 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST if [ $? -eq 1 ]; then if [ $withtap -eq "1" ]; then @@ -404,12 +410,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 @@ -428,6 +434,63 @@ function stop_lttng_sessiond_notap() stop_lttng_sessiond_opt 0 "$@" } +function stop_lttng_consumerd_opt() +{ + local withtap=$1 + local signal=$2 + local kill_opt="" + + PID_CONSUMERD=`pgrep --full $CONSUMERD_BIN` + + if [ -n "$2" ]; then + kill_opt="$kill_opt -s $signal" + fi + + if [ $withtap -eq "1" ]; then + diag "Killing lttng-consumerd (pid: $PID_CONSUMERD)" + 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 "Kill consumer daemon" + fi + return 1 + else + out=1 + while [ $out -ne 0 ]; do + pid=$(pgrep --full $CONSUMERD_BIN) + + # If consumerds are still present check their status. + # A zombie status qualifies the consumerd as *killed* + out=0 + for consumer_pid in $pid; do + state=$(ps -p $consumer_pid -o state= ) + if [[ -n "$state" && "$state" != "Z" ]]; then + out=1 + fi + done + sleep 0.5 + done + if [ $withtap -eq "1" ]; then + pass "Kill consumer daemon" + fi + fi + return $retval +} + +function stop_lttng_consumerd() +{ + stop_lttng_consumerd_opt 1 "$@" +} + +function stop_lttng_consumerd_notap() +{ + stop_lttng_consumerd_opt 0 "$@" +} + function list_lttng_with_opts () { local opts=$1 @@ -448,12 +511,13 @@ function create_lttng_session () local expected_to_fail=$1 local sess_name=$2 local trace_path=$3 + local opt=$4 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path > $OUTPUT_DEST + $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name -o $trace_path $opt > $OUTPUT_DEST ret=$? if [[ $expected_to_fail -eq "1" ]]; then test "$ret" -ne "0" - ok $? "Expected fail on session creation $sess_name in $trace_path" + ok $? "Create session $sess_name in $trace_path failed as expected" else ok $ret "Create session $sess_name in $trace_path" fi @@ -472,15 +536,16 @@ function create_lttng_session_fail () function enable_ust_lttng_channel () { - local expect_fail=$1 + local expected_to_fail=$1 local sess_name=$2 local channel_name=$3 + local opt=$4 - $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST + $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" + ok $? "Enable channel $channel_name for session $sess_name failed as expected" else ok $ret "Enable channel $channel_name for session $sess_name" fi @@ -541,9 +606,9 @@ 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" + ok $? "Enable ust event $event_name for session $session_name failed as expected" else - ok $ret "Enable event $event_name for session $sess_name" + ok $ret "Enable ust event $event_name for session $sess_name" fi } @@ -745,7 +810,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 @@ -770,7 +835,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 @@ -795,7 +860,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 @@ -829,7 +894,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 @@ -855,7 +920,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 @@ -893,7 +958,7 @@ 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() @@ -901,7 +966,7 @@ function lttng_load() local opts=$1 $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST - ok $? "Load command successful" + ok $? "Load command with opts: $opts" } function lttng_track() @@ -914,7 +979,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 } @@ -938,7 +1003,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 } @@ -952,6 +1017,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