projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: tests: stderr not correctly redirected
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 2510da59371a665b80fa8696d455521a8b2c8701..9b1c872698ca48a48dd675d3f57c82f091f7aec3 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-20,13
+20,19
@@
CONSUMERD_BIN="lttng-consumerd"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
BABELTRACE_BIN="babeltrace"
RELAYD_BIN="lttng-relayd"
LTTNG_BIN="lttng"
BABELTRACE_BIN="babeltrace"
-OUTPUT_DEST=/dev/null 2>&1
+OUTPUT_DEST=/dev/null
+ERROR_OUTPUT_DEST=/dev/null
# Minimal kernel version supported for session daemon tests
KERNEL_MAJOR_VERSION=2
KERNEL_MINOR_VERSION=6
KERNEL_PATCHLEVEL_VERSION=27
# Minimal kernel version supported for session daemon tests
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.
+export LTTNG_UST_REGISTER_TIMEOUT=-1
+
source $TESTDIR/utils/tap/tap.sh
function print_ok ()
source $TESTDIR/utils/tap/tap.sh
function print_ok ()
@@
-98,7
+104,7
@@
function lttng_enable_kernel_event
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -k
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable kernel event $event_name for session $sess_name"
}
ok $? "Enable kernel event $event_name for session $sess_name"
}
@@
-121,7
+127,7
@@
function lttng_enable_kernel_syscall()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --syscall "$syscall_name" $chan -s $sess_name -k
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
@@
-160,7
+166,7
@@
function lttng_disable_kernel_syscall()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event --syscall "$syscall_name" $chan -s $sess_name -k
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
@@
-187,7
+193,7
@@
function lttng_enable_kernel_channel()
local sess_name=$2
local channel_name=$3
local sess_name=$2
local channel_name=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
@@
-213,7
+219,7
@@
function lttng_disable_kernel_channel()
local sess_name=$2
local channel_name=$3
local sess_name=$2
local channel_name=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -k $channel_name -s $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
@@
-240,7
+246,7
@@
function start_lttng_relayd
DIR=$(readlink -f $TESTDIR)
if [ -z $(pidof lt-$RELAYD_BIN) ]; then
DIR=$(readlink -f $TESTDIR)
if [ -z $(pidof lt-$RELAYD_BIN) ]; then
- $DIR/../src/bin/lttng-relayd/$RELAYD_BIN -b $opt
>$
OUTPUT_DEST
+ $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
fail "Start lttng-relayd (opt: $opt)"
#$DIR/../src/bin/lttng-relayd/$RELAYD_BIN $opt -vvv >>/tmp/relayd.log 2>&1 &
if [ $? -eq 1 ]; then
fail "Start lttng-relayd (opt: $opt)"
@@
-258,7
+264,7
@@
function stop_lttng_relayd_nocheck
PID_RELAYD=`pidof lt-$RELAYD_BIN`
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
PID_RELAYD=`pidof lt-$RELAYD_BIN`
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
- kill $PID_RELAYD
>$
OUTPUT_DEST
+ kill $PID_RELAYD
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
retval=$?
if [ $retval -eq 1 ]; then
retval=$?
if [ $retval -eq 1 ]; then
@@
-326,7
+332,7
@@
function stop_lttng_sessiond ()
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
PID_SESSIOND=`pidof lt-$SESSIOND_BIN`
- kill $PID_SESSIOND
>$
OUTPUT_DEST
+ kill $PID_SESSIOND
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
if [ $? -eq 1 ]; then
fail "Kill sessions daemon"
if [ $? -eq 1 ]; then
fail "Kill sessions daemon"
@@
-349,7
+355,7
@@
function stop_lttng_sessiond ()
function list_lttng_with_opts ()
{
local opts=$1
function list_lttng_with_opts ()
{
local opts=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN list $opts
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Lttng-tool list command with option $opts"
}
ok $? "Lttng-tool list command with option $opts"
}
@@
-357,7
+363,7
@@
function create_lttng_session_no_output ()
{
local sess_name=$1
{
local sess_name=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN create $sess_name --no-output
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Create session $sess_name in no-output mode"
}
ok $? "Create session $sess_name in no-output mode"
}
@@
-383,7
+389,7
@@
function enable_ust_lttng_channel()
local channel_name=$2
local expect_fail=$3
local channel_name=$2
local expect_fail=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expect_fail ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expect_fail ]]; then
test "$ret" -ne "0"
@@
-398,7
+404,7
@@
function disable_ust_lttng_channel()
local sess_name=$1
local channel_name=$2
local sess_name=$1
local channel_name=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-channel -u $channel_name -s $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Disable channel $channel_name for session $sess_name"
}
ok $? "Disable channel $channel_name for session $sess_name"
}
@@
-407,7
+413,7
@@
function enable_lttng_mmap_overwrite_kernel_channel()
local sess_name=$1
local channel_name=$2
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
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -k --output mmap --overwrite
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable channel $channel_name for session $sess_name"
}
ok $? "Enable channel $channel_name for session $sess_name"
}
@@
-416,7
+422,7
@@
function enable_lttng_mmap_overwrite_ust_channel()
local sess_name=$1
local channel_name=$2
local sess_name=$1
local channel_name=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -s $sess_name $channel_name -u --output mmap --overwrite
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable channel $channel_name for session $sess_name"
}
ok $? "Enable channel $channel_name for session $sess_name"
}
@@
-434,7
+440,7
@@
function enable_ust_lttng_event ()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -u
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test $ret -ne "0"
ret=$?
if [[ $expected_to_fail ]]; then
test $ret -ne "0"
@@
-457,7
+463,7
@@
function enable_jul_lttng_event()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -j
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable JUL event $event_name for session $sess_name"
}
ok $? "Enable JUL event $event_name for session $sess_name"
}
@@
-475,7
+481,7
@@
function enable_jul_lttng_event_loglevel()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -j
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
}
ok $? "Enable JUL event $event_name for session $sess_name with loglevel $loglevel"
}
@@
-492,7
+498,7
@@
function enable_log4j_lttng_event()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" $chan -s $sess_name -l
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable LOG4J event $event_name for session $sess_name"
}
ok $? "Enable LOG4J event $event_name for session $sess_name"
}
@@
-510,7
+516,7
@@
function enable_log4j_lttng_event_loglevel()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event --loglevel $loglevel "$event_name" $chan -s $sess_name -l
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
}
ok $? "Enable LOG4J event $event_name for session $sess_name with loglevel $loglevel"
}
@@
-520,7
+526,7
@@
function enable_ust_lttng_event_filter()
local event_name="$2"
local filter="$3"
local event_name="$2"
local filter="$3"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter"
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --filter "$filter"
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable event $event_name with filtering for session $sess_name"
}
ok $? "Enable event $event_name with filtering for session $sess_name"
}
@@
-530,7
+536,7
@@
function enable_ust_lttng_event_loglevel()
local event_name="$2"
local loglevel="$3"
local event_name="$2"
local loglevel="$3"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel $loglevel
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable event $event_name with loglevel $loglevel"
}
ok $? "Enable event $event_name with loglevel $loglevel"
}
@@
-540,7
+546,7
@@
function enable_ust_lttng_event_loglevel_only()
local event_name="$2"
local loglevel="$3"
local event_name="$2"
local loglevel="$3"
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-event "$event_name" -s $sess_name -u --loglevel-only $loglevel
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Enable event $event_name with loglevel-only $loglevel"
}
ok $? "Enable event $event_name with loglevel-only $loglevel"
}
@@
-557,7
+563,7
@@
function disable_ust_lttng_event ()
chan="-c $channel_name"
fi
chan="-c $channel_name"
fi
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN disable-event "$event_name" -s $sess_name $chan -u
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Disable event $event_name for session $sess_name"
}
ok $? "Disable event $event_name for session $sess_name"
}
@@
-584,7
+590,7
@@
function start_lttng_tracing ()
local sess_name=$1
local expected_to_fail=$2
local sess_name=$1
local expected_to_fail=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN start $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@
-599,7
+605,7
@@
function stop_lttng_tracing ()
local sess_name=$1
local expected_to_fail=$2
local sess_name=$1
local expected_to_fail=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN stop $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@
-614,7
+620,7
@@
function destroy_lttng_session ()
local sess_name=$1
local expected_to_fail=$2
local sess_name=$1
local expected_to_fail=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@
-626,7
+632,7
@@
function destroy_lttng_session ()
function destroy_lttng_sessions ()
{
function destroy_lttng_sessions ()
{
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy --all
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Destroy all lttng sessions"
}
ok $? "Destroy all lttng sessions"
}
@@
-636,7
+642,7
@@
function lttng_snapshot_add_output ()
local trace_path=$2
local expected_to_fail=$3
local trace_path=$2
local expected_to_fail=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot add-output -s $sess_name file://$trace_path
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@
-652,7
+658,7
@@
function lttng_snapshot_del_output ()
local id=$2
local expected_to_fail=$3
local id=$2
local expected_to_fail=$3
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot del-output -s $sess_name $id
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail ]]; then
test "$ret" -ne "0"
@@
-667,14
+673,14
@@
function lttng_snapshot_record ()
local sess_name=$1
local trace_path=$2
local sess_name=$1
local trace_path=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot record -s $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Snapshot recorded"
}
function lttng_snapshot_list ()
{
local sess_name=$1
ok $? "Snapshot recorded"
}
function lttng_snapshot_list ()
{
local sess_name=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN snapshot list-output -s $sess_name
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Snapshot list"
}
ok $? "Snapshot list"
}
@@
-683,7
+689,7
@@
function lttng_save()
local sess_name=$1
local opts=$2
local sess_name=$1
local opts=$2
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Session successfully saved"
}
ok $? "Session successfully saved"
}
@@
-691,7
+697,7
@@
function lttng_load()
{
local opts=$1
{
local opts=$1
- $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts
>$
OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts
1> $OUTPUT_DEST 2> $ERROR_
OUTPUT_DEST
ok $? "Load command successful"
}
ok $? "Load command successful"
}
This page took
0.037934 seconds
and
4
git commands to generate.