# 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 ()
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
}
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
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
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
}
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
{
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)"
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
: ${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
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"
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
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"
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*
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
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 $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
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
}
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
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
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
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
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
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
$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()
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
}
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
}
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
projects / lttng-tools.git / blobdiff