projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: refuse to run test suite if lttng processes are present
[lttng-tools.git]
/
tests
/
utils
/
utils.sh
diff --git
a/tests/utils/utils.sh
b/tests/utils/utils.sh
index 080aa4d5d684ce61eeeac8d4e4afeeceede792cd..e8dfcda3cedf157c334d594bbc187d42020c4864 100644
(file)
--- a/
tests/utils/utils.sh
+++ b/
tests/utils/utils.sh
@@
-127,10
+127,11
@@
function conf_proc_count()
function enable_kernel_lttng_event
{
function enable_kernel_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 "$event_name" ]; then
# Enable all event if no event name specified
if [ -z "$event_name" ]; then
# Enable all event if no event name specified
@@
-148,20
+149,30
@@
function enable_kernel_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 kernel event $event_name for session $session_name on channel $channel_name failed as expected"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Enable kernel event $event_name for session $session_name on channel $channel_name failed as expected"
+ fi
else
else
- ok $ret "Enable kernel event $event_name for session $sess_name"
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Enable kernel event $event_name for session $sess_name"
+ fi
fi
}
function enable_kernel_lttng_event_ok ()
{
fi
}
function enable_kernel_lttng_event_ok ()
{
- enable_kernel_lttng_event 0 "$@"
+ enable_kernel_lttng_event
1
0 "$@"
}
function enable_kernel_lttng_event_fail ()
{
}
function enable_kernel_lttng_event_fail ()
{
- enable_kernel_lttng_event 1 "$@"
+ enable_kernel_lttng_event 1 1 "$@"
+}
+
+function enable_kernel_lttng_event_notap ()
+{
+ enable_kernel_lttng_event 0 0 "$@"
}
# Old interface
}
# Old interface
@@
-251,28
+262,45
@@
function lttng_disable_kernel_syscall_fail()
function lttng_enable_kernel_channel()
{
function lttng_enable_kernel_channel()
{
- local expected_to_fail=$1
- local sess_name=$2
- local channel_name=$3
+ 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 -k $channel_name -s $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
+ $TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -k $channel_name -s $sess_name
$opt
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"
- ok $? "Enable channel $channel_name for session $sess_name failed as expected"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Enable channel $channel_name for session $sess_name failed as expected"
+ fi
else
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
}
function lttng_enable_kernel_channel_ok()
{
fi
}
function lttng_enable_kernel_channel_ok()
{
- lttng_enable_kernel_channel 0 "$@"
+ lttng_enable_kernel_channel
1
0 "$@"
}
function lttng_enable_kernel_channel_fail()
{
}
function lttng_enable_kernel_channel_fail()
{
- lttng_enable_kernel_channel 1 "$@"
+ lttng_enable_kernel_channel 1 1 "$@"
+}
+
+function lttng_enable_kernel_channel_notap()
+{
+ lttng_enable_kernel_channel 0 0 "$@"
+}
+
+function enable_kernel_lttng_channel_ok()
+{
+ lttng_enable_kernel_channel 1 0 "$@"
}
function lttng_disable_kernel_channel()
}
function lttng_disable_kernel_channel()
@@
-384,6
+412,7
@@
function start_lttng_sessiond_opt()
local withtap=$1
local load_path=$2
local withtap=$1
local load_path=$2
+ local env_vars=""
local consumerd=""
local long_bit_value=$(getconf LONG_BIT)
local consumerd=""
local long_bit_value=$(getconf LONG_BIT)
@@
-407,6
+436,11
@@
function start_lttng_sessiond_opt()
;;
esac
;;
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"
validate_kernel_version
if [ $? -ne 0 ]; then
fail "Start session daemon"
@@
-419,9
+453,9
@@
function start_lttng_sessiond_opt()
if [ -z $(pgrep ${SESSIOND_MATCH}) ]; then
# Have a load path ?
if [ -n "$load_path" ]; then
if [ -z $(pgrep ${SESSIOND_MATCH}) ]; then
# Have a load path ?
if [ -n "$load_path" ]; then
- $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background $consumerd
+
env $env_vars
$DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --load "$load_path" --background $consumerd
else
else
- $DIR/../src/bin/lttng-sessiond/$SESSIOND_BIN --background $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=$?
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=$?
@@
-681,57
+715,81
@@
function create_lttng_session_no_output ()
function create_lttng_session ()
{
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=$?
$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"
test "$ret" -ne "0"
- ok $? "Create session $sess_name in $trace_path failed as expected"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Create session $sess_name in $trace_path failed as expected"
+ fi
else
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
fi
+ return $ret
}
function create_lttng_session_ok ()
{
}
function create_lttng_session_ok ()
{
- create_lttng_session 0 "$@"
+ create_lttng_session
1
0 "$@"
}
function create_lttng_session_fail ()
{
}
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 ()
{
}
function enable_ust_lttng_channel ()
{
- local expected_to_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 [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN enable-channel -u $channel_name -s $sess_name $opt 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Enable channel $channel_name for session $sess_name failed as expected"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Enable channel $channel_name for session $sess_name failed as expected"
+ fi
else
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
fi
+ return $ret
}
function enable_ust_lttng_channel_ok ()
{
}
function enable_ust_lttng_channel_ok ()
{
- enable_ust_lttng_channel 0 "$@"
+ enable_ust_lttng_channel
1
0 "$@"
}
function enable_ust_lttng_channel_fail ()
{
}
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()
}
function disable_ust_lttng_channel()
@@
-781,10
+839,11
@@
function enable_lttng_mmap_overwrite_ust_channel()
function enable_ust_lttng_event ()
{
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
if [ -z $channel_name ]; then
# default channel if none specified
@@
-797,20
+856,31
@@
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 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
else
- ok $ret "Enable ust 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
fi
+ return $ret
}
function enable_ust_lttng_event_ok ()
{
}
function enable_ust_lttng_event_ok ()
{
- enable_ust_lttng_event 0 "$@"
+ enable_ust_lttng_event
1
0 "$@"
}
function enable_ust_lttng_event_fail ()
{
}
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()
}
function enable_jul_lttng_event()
@@
-1044,30
+1114,40
@@
function stop_lttng_tracing_fail ()
function destroy_lttng_session ()
{
function destroy_lttng_session ()
{
- local expected_to_fail=$1
- local sess_name=$2
+ local withtap=$1
+ local expected_to_fail=$2
+ local sess_name=$3
$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
$TESTDIR/../src/bin/lttng/$LTTNG_BIN destroy $sess_name 1> $OUTPUT_DEST 2> $ERROR_OUTPUT_DEST
ret=$?
if [[ $expected_to_fail -eq "1" ]]; then
test "$ret" -ne "0"
- ok $? "Destroy session $sess_name failed as expected"
+ ret=$?
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Destroy session $sess_name failed as expected"
+ fi
else
else
- ok $ret "Destroy session $sess_name"
+ if [ $withtap -eq "1" ]; then
+ ok $ret "Destroy session $sess_name"
+ fi
fi
}
function destroy_lttng_session_ok ()
{
fi
}
function destroy_lttng_session_ok ()
{
- destroy_lttng_session 0 "$@"
+ destroy_lttng_session
1
0 "$@"
}
function destroy_lttng_session_fail ()
{
}
function destroy_lttng_session_fail ()
{
- destroy_lttng_session 1 "$@"
+ destroy_lttng_session 1
1
"$@"
}
}
+function destroy_lttng_session_notap ()
+{
+ destroy_lttng_session 0 0 "$@"
+}
function destroy_lttng_sessions ()
{
function destroy_lttng_sessions ()
{
This page took
0.028613 seconds
and
4
git commands to generate.