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: leak of prefix on error to register lttng namespace
[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 13909c1bfc04b7fe1d4c55168559240877a72e1a..ad03bf404863a1d603f709ff1567de725737854a 100755
(executable)
--- a/
tests/regression/tools/crash/test_crash
+++ b/
tests/regression/tools/crash/test_crash
@@
-31,6
+31,8
@@
NR_ITER=-1
# Temp file output
OUTPUT_DIR=$(mktemp -d)
# Temp file output
OUTPUT_DIR=$(mktemp -d)
+LAST_APP_PID=
+
NUM_TESTS=77
source $TESTDIR/utils/utils.sh
NUM_TESTS=77
source $TESTDIR/utils/utils.sh
@@
-50,6
+52,7
@@
function start_test_app()
# Start application with a temporary file.
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
ret=$?
# Start application with a temporary file.
$TESTAPP_BIN $NR_ITER $NR_USEC_WAIT $tmp_file &
ret=$?
+ LAST_APP_PID="${!}"
APPS_PID="${APPS_PID} ${!}"
ok $ret "Start application to trace"
APPS_PID="${APPS_PID} ${!}"
ok $ret "Start application to trace"
@@
-81,6
+84,7
@@
function stop_test_app()
diag "Stopping $p"
kill ${p} 2>/dev/null
wait ${p} 2>/dev/null
diag "Stopping $p"
kill ${p} 2>/dev/null
wait ${p} 2>/dev/null
+ diag "Stopped $p"
done
}
done
}
@@
-118,7
+122,7
@@
function test_shm_path_per_pid()
diag "Shm: check folder creation and structure"
start_test_app
diag "Shm: check folder creation and structure"
start_test_app
- first_app_pid=$
APPS
_PID
+ first_app_pid=$
LAST_APP
_PID
shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
file_count=$(echo "$shm_session_path"| wc -l)
shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
file_count=$(echo "$shm_session_path"| wc -l)
@@
-141,6
+145,7
@@
function test_shm_path_per_pid()
diag "Shm: check basic creation of second ust application"
start_test_app
diag "Shm: check basic creation of second ust application"
start_test_app
+ second_app_pid=$LAST_APP_PID
second_pid_path=$(find $shm_session_path/ust/pid -mindepth 1 -maxdepth 1)
ok $? "Pid path exist found $second_pid_path"
second_pid_path=$(find $shm_session_path/ust/pid -mindepth 1 -maxdepth 1)
ok $? "Pid path exist found $second_pid_path"
@@
-150,6
+155,7
@@
function test_shm_path_per_pid()
# Stop first test application and check for cleanup
stop_test_app "$first_app_pid"
# Stop first test application and check for cleanup
stop_test_app "$first_app_pid"
+ APPS_PID="$second_app_pid"
verify_path_dont_exists "$first_pid_path"
ok $? "First pid cleanup"
verify_path_dont_exists "$first_pid_path"
ok $? "First pid cleanup"
@@
-392,8
+398,7
@@
function interrupt_cleanup()
{
diag "*** Cleaning-up test ***"
stop_test_apps
{
diag "*** Cleaning-up test ***"
stop_test_apps
- stop_lttng_sessiond
- exit 1
+ full_cleanup
}
TESTS=(
}
TESTS=(
This page took
0.028881 seconds
and
4
git commands to generate.