projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coverity warning: sessiond: uncaught exception in main
[lttng-tools.git]
/
tests
/
regression
/
kernel
/
test_callstack
diff --git
a/tests/regression/kernel/test_callstack
b/tests/regression/kernel/test_callstack
index c4a6200dae0351e2ad86ee727d11631fec0f28fb..ecbba30661f0ee233a83400848fc0eb6ba751c0c 100755
(executable)
--- a/
tests/regression/kernel/test_callstack
+++ b/
tests/regression/kernel/test_callstack
@@
-33,12
+33,14
@@
function lttng_track_pid()
function run_workload()
{
local TEST_APP=$1
function run_workload()
{
local TEST_APP=$1
- local start_file_sync
- start_file_sync=$(mktemp -u)
+ # shift the first argument, passing along the other args if any to the
+ # test app.
+ shift
+ local start_file_sync=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_first.XXXXXX")
lttng_untrack_all
lttng_untrack_all
- ./"$TEST_APP" "$start_file_sync" &
+ ./"$TEST_APP" "$start_file_sync"
"$@"
&
PID=$!
lttng_track_pid $PID
PID=$!
lttng_track_pid $PID
@@
-58,7
+60,7
@@
function run_workload()
function test_user_callstack()
{
function test_user_callstack()
{
- TRACE_PATH=$(mktemp -d)
+ TRACE_PATH=$(mktemp -d
-t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX"
)
# This is the expected userspace callstack. (see gen-syscall-events-callstack.c)
USER_CS_EXPECTED="main fct_a fct_b fct_c my_gettid"
EVENT_NAME="gettid"
# This is the expected userspace callstack. (see gen-syscall-events-callstack.c)
USER_CS_EXPECTED="main fct_a fct_b fct_c my_gettid"
EVENT_NAME="gettid"
@@
-82,7
+84,7
@@
function test_user_callstack()
function test_kernel_callstack()
{
function test_kernel_callstack()
{
- TRACE_PATH=$(mktemp -d)
+ TRACE_PATH=$(mktemp -d
-t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX"
)
# Those are symbol expected to be present in the kernel callstack. This
# is not an exhaustive list since it's kernel dependent.
# Those are symbol expected to be present in the kernel callstack. This
# is not an exhaustive list since it's kernel dependent.
@@
-108,7
+110,7
@@
function test_kernel_callstack()
lttng_enable_kernel_syscall_ok "$SESSION_NAME" "$EVENT_NAME" "$CHANNEL_NAME"
add_context_kernel_ok "$SESSION_NAME" "$CHANNEL_NAME" "callstack-kernel"
lttng_enable_kernel_syscall_ok "$SESSION_NAME" "$EVENT_NAME" "$CHANNEL_NAME"
add_context_kernel_ok "$SESSION_NAME" "$CHANNEL_NAME" "callstack-kernel"
- run_workload
$TEST_APP_KERNELSPACE
+ run_workload
"$TEST_APP_KERNELSPACE" "/proc/cpuinfo" "/proc/cmdline"
destroy_lttng_session_ok "$SESSION_NAME"
destroy_lttng_session_ok "$SESSION_NAME"
@@
-132,6
+134,8
@@
plan_tests $NUM_TESTS
print_test_banner "$TEST_DESC"
print_test_banner "$TEST_DESC"
+bail_out_if_no_babeltrace
+
if [ "$(id -u)" == "0" ]; then
isroot=1
else
if [ "$(id -u)" == "0" ]; then
isroot=1
else
@@
-140,18
+144,14
@@
fi
skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" ||
{
skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" ||
{
- which "$BABELTRACE_BIN" > /dev/null
- test $? -ne 0
- skip $? "Babeltrace binary not found. Skipping callstack tests" "$NUM_TESTS" ||
- {
- start_lttng_sessiond
+ validate_lttng_modules_present
+ start_lttng_sessiond
-
if test $RUN_USERSPACE_TEST == 1; then
-
test_user_callstack
-
fi
+ if test $RUN_USERSPACE_TEST == 1; then
+ test_user_callstack
+ fi
-
test_kernel_callstack
+ test_kernel_callstack
- stop_lttng_sessiond
- }
+ stop_lttng_sessiond
}
}
This page took
0.026119 seconds
and
4
git commands to generate.