projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Introduce conf_proc_count()
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 5ffe6eb47ad8da6836e3e183356cb09066360033..da23f7abeb1780191b86e41a0a88219fd32eeb56 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-86,6
+86,16
@@
function randstring()
echo
}
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
+}
+
function enable_kernel_lttng_event
{
local expected_to_fail="$1"
function enable_kernel_lttng_event
{
local expected_to_fail="$1"
@@
-194,7
+204,7
@@
function lttng_disable_kernel_syscall()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
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 fail
ed
as expected"
else
ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
fi
else
ok $ret "Disable kernel syscall $syscall_name for session $sess_name on channel $channel_name"
fi
@@
-220,7
+230,7
@@
function lttng_enable_kernel_channel()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "E
xpected failure on kernel channel creation $channel_name in $sess_name
"
+ ok $? "E
nable channel $channel_name for session $sess_name failed as expected
"
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
@@
-246,9
+256,9
@@
function lttng_disable_kernel_channel()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
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
else
- ok $ret "
d
isable channel $channel_name for session $sess_name"
+ ok $ret "
D
isable channel $channel_name for session $sess_name"
fi
}
fi
}
@@
-269,7
+279,7
@@
function start_lttng_relayd_opt()
DIR=$(readlink -f $TESTDIR)
DIR=$(readlink -f $TESTDIR)
- if [ -z $(p
idof
lt-$RELAYD_BIN) ]; then
+ if [ -z $(p
grep --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
$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
+311,7
@@
function stop_lttng_relayd_opt()
{
local withtap=$1
{
local withtap=$1
- PID_RELAYD=`p
idof
lt-$RELAYD_BIN`
+ PID_RELAYD=`p
grep --full
lt-$RELAYD_BIN`
if [ $withtap -eq "1" ]; then
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
if [ $withtap -eq "1" ]; then
diag "Killing lttng-relayd (pid: $PID_RELAYD)"
@@
-317,7
+327,7
@@
function stop_lttng_relayd_opt()
else
out=1
while [ -n "$out" ]; do
else
out=1
while [ -n "$out" ]; do
- out=$(p
idof
lt-$RELAYD_BIN)
+ out=$(p
grep --full
lt-$RELAYD_BIN)
sleep 0.5
done
if [ $withtap -eq "1" ]; then
sleep 0.5
done
if [ $withtap -eq "1" ]; then
@@
-359,10
+369,10
@@
function start_lttng_sessiond_opt()
: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
export LTTNG_SESSION_CONFIG_XSD_PATH
: ${LTTNG_SESSION_CONFIG_XSD_PATH=${DIR}/../src/common/config/}
export LTTNG_SESSION_CONFIG_XSD_PATH
- if [ -z $(p
idof
lt-$SESSIOND_BIN) ]; then
+ if [ -z $(p
grep --full
lt-$SESSIOND_BIN) ]; then
# Have a load path ?
if [ -n "$load_path" ]; 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
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
+405,7
@@
function stop_lttng_sessiond_opt()
return
fi
return
fi
- PID_SESSIOND=`p
idof
lt-$SESSIOND_BIN`
+ PID_SESSIOND=`p
grep --full
lt-$SESSIOND_BIN`
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
@@
-410,12
+420,12
@@
function stop_lttng_sessiond_opt()
else
out=1
while [ -n "$out" ]; do
else
out=1
while [ -n "$out" ]; do
- out=$(p
idof
lt-$SESSIOND_BIN)
+ out=$(p
grep --full
lt-$SESSIOND_BIN)
sleep 0.5
done
out=1
while [ -n "$out" ]; do
sleep 0.5
done
out=1
while [ -n "$out" ]; do
- out=$(p
idof
$CONSUMERD_BIN)
+ out=$(p
grep --full
$CONSUMERD_BIN)
sleep 0.5
done
if [ $withtap -eq "1" ]; then
sleep 0.5
done
if [ $withtap -eq "1" ]; then
@@
-440,7
+450,7
@@
function stop_lttng_consumerd_opt()
local signal=$2
local kill_opt=""
local signal=$2
local kill_opt=""
- PID_CONSUMERD=`p
idof
$CONSUMERD_BIN`
+ PID_CONSUMERD=`p
grep --full
$CONSUMERD_BIN`
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
if [ -n "$2" ]; then
kill_opt="$kill_opt -s $signal"
@@
-461,7
+471,7
@@
function stop_lttng_consumerd_opt()
else
out=1
while [ $out -ne 0 ]; do
else
out=1
while [ $out -ne 0 ]; do
- pid=$(p
idof
$CONSUMERD_BIN)
+ pid=$(p
grep --full
$CONSUMERD_BIN)
# If consumerds are still present check their status.
# A zombie status qualifies the consumerd as *killed*
# If consumerds are still present check their status.
# A zombie status qualifies the consumerd as *killed*
@@
-517,7
+527,7
@@
function create_lttng_session ()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
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
else
ok $ret "Create session $sess_name in $trace_path"
fi
@@
-536,16
+546,16
@@
function create_lttng_session_fail ()
function enable_ust_lttng_channel ()
{
function enable_ust_lttng_channel ()
{
- local expect_fail=$1
+ local expect
ed_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=$?
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 [[ $expect
ed_to
_fail -eq "1" ]]; then
test "$ret" -ne "0"
test "$ret" -ne "0"
- ok $? "E
xpected fail on ust channel creation $channel_name in $sess_name
"
+ ok $? "E
nable channel $channel_name for session $sess_name failed as expected
"
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
else
ok $ret "Enable channel $channel_name for session $sess_name"
fi
@@
-606,9
+616,9
@@
function enable_ust_lttng_event ()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test $ret -ne "0"
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
else
- ok $ret "Enable event $event_name for session $sess_name"
+ ok $ret "Enable
ust
event $event_name for session $sess_name"
fi
}
fi
}
@@
-810,7
+820,7
@@
function start_lttng_tracing ()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
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
else
ok $ret "Start tracing for session $sess_name"
fi
@@
-835,7
+845,7
@@
function stop_lttng_tracing ()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
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
else
ok $ret "Stop lttng tracing for session $sess_name"
fi
@@
-860,7
+870,7
@@
function destroy_lttng_session ()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
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
else
ok $ret "Destroy session $sess_name"
fi
@@
-894,7
+904,7
@@
function lttng_snapshot_add_output ()
ret=$?
if [[ $expected_to_fail -eq 1 ]]; then
test "$ret" -ne "0"
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
else
ok $ret "Added snapshot output file://$trace_path"
fi
@@
-920,7
+930,7
@@
function lttng_snapshot_del_output ()
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "
Expect fail on deletion of snapshot output id $i
d"
+ ok $? "
Deleted snapshot output id $id failed as expecte
d"
else
ok $ret "Deleted snapshot output id $id"
fi
else
ok $ret "Deleted snapshot output id $id"
fi
@@
-958,7
+968,7
@@
function lttng_save()
local opts=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
local opts=$2
$TESTDIR/../src/bin/lttng/$LTTNG_BIN save $sess_name $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
- ok $? "Session s
uccessfully s
aved"
+ ok $? "Session saved"
}
function lttng_load()
}
function lttng_load()
@@
-966,7
+976,7
@@
function lttng_load()
local opts=$1
$TESTDIR/../src/bin/lttng/$LTTNG_BIN load $opts 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
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()
}
function lttng_track()
@@
-979,7
+989,7
@@
function lttng_track()
test $ret -ne "0"
ok $? "Track command failed as expected with opts: $opts"
else
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
}
fi
}
@@
-1003,7
+1013,7
@@
function lttng_untrack()
test $ret -ne "0"
ok $? "Untrack command failed as expected with opts: $opts"
else
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
}
fi
}
This page took
0.027577 seconds
and
4
git commands to generate.