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: test_crash should start sessions
[lttng-tools.git]
/
tests
/
regression
/
tools
/
crash
/
test_crash
diff --git
a/tests/regression/tools/crash/test_crash
b/tests/regression/tools/crash/test_crash
index 35a5bd7bcb72fd858cd3338de2fe1d308157de1c..8c62c513ddb95585270d3ddf03c47fa669abdd6f 100755
(executable)
--- a/
tests/regression/tools/crash/test_crash
+++ b/
tests/regression/tools/crash/test_crash
@@
-31,7
+31,7
@@
NR_ITER=-1
# Temp file output
OUTPUT_DIR=$(mktemp -d)
# Temp file output
OUTPUT_DIR=$(mktemp -d)
-NUM_TESTS=7
1
+NUM_TESTS=7
7
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-87,19
+87,11
@@
function stop_test_app()
function verify_path_dont_exists()
{
local path=$1
function verify_path_dont_exists()
{
local path=$1
- local timeout_try_limit=100
- local timeout_try_count=0
- local timeout_flag=0
while find $path -mindepth 1 -maxdepth 1 &>/dev/null ; do
while find $path -mindepth 1 -maxdepth 1 &>/dev/null ; do
- if [[ $timeout_try_count -gt $timeout_try_limit ]]; then
- timeout_flag=1
- break
- fi
- timeout_try_count=$((timeout_try_count+1))
- sleep 0.1
+ sleep 2
done
done
- return
$timeout_flag
+ return
0
}
function test_shm_path_per_pid()
}
function test_shm_path_per_pid()
@@
-114,6
+106,8
@@
function test_shm_path_per_pid()
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-pid"
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-pid"
+ start_lttng_tracing_ok $session_name
+
diag "Shm: clean state"
file_count=$(find $shm_path -mindepth 1 -maxdepth 1 | wc -l)
test $file_count -eq "0"
diag "Shm: clean state"
file_count=$(find $shm_path -mindepth 1 -maxdepth 1 | wc -l)
test $file_count -eq "0"
@@
-182,6
+176,8
@@
function test_shm_path_per_uid()
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-uid"
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-uid"
+ start_lttng_tracing_ok $session_name
+
diag "Shm: test clean state"
file_count=$(find $shm_path -mindepth 1 -maxdepth 1 | wc -l)
test $file_count -eq "0"
diag "Shm: test clean state"
file_count=$(find $shm_path -mindepth 1 -maxdepth 1 | wc -l)
test $file_count -eq "0"
@@
-303,6
+299,8
@@
function test_shm_path_per_pid_sigint()
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-pid"
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-pid"
+ start_lttng_tracing_ok $session_name
+
start_test_app
start_test_app
shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
start_test_app
start_test_app
shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
@@
-332,6
+330,8
@@
function test_shm_path_per_uid_sigint()
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-uid"
create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-uid"
+ start_lttng_tracing_ok $session_name
+
start_test_app
start_test_app
shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
start_test_app
start_test_app
shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
@@
-368,6
+368,9
@@
function test_lttng_crash_extraction_sigkill()
# Generate 10 events
$TESTAPP_BIN 10 0
# Generate 10 events
$TESTAPP_BIN 10 0
+ sigstop_lttng_sessiond
+ sigstop_lttng_consumerd
+
# Kill the consumers then sessiond with sigkill
stop_lttng_consumerd SIGKILL
stop_lttng_sessiond SIGKILL
# Kill the consumers then sessiond with sigkill
stop_lttng_consumerd SIGKILL
stop_lttng_sessiond SIGKILL
@@
-385,6
+388,14
@@
function test_lttng_crash_extraction_sigkill()
rm -rf $extraction_dir_path
}
rm -rf $extraction_dir_path
}
+function interrupt_cleanup()
+{
+ diag "*** Cleaning-up test ***"
+ stop_test_apps
+ stop_lttng_sessiond
+ exit 1
+}
+
TESTS=(
test_shm_path_per_uid
test_shm_path_per_pid
TESTS=(
test_shm_path_per_uid
test_shm_path_per_pid
@@
-395,6
+406,7
@@
TESTS=(
test_lttng_crash_extraction_sigkill
)
test_lttng_crash_extraction_sigkill
)
+trap interrupt_cleanup SIGTERM SIGINT
for fct_test in ${TESTS[@]};
do
for fct_test in ${TESTS[@]};
do
This page took
0.024176 seconds
and
4
git commands to generate.