projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: invoke full_cleanup from script trap handlers, use modprobe -r
[lttng-tools.git]
/
tests
/
regression
/
kernel
/
test_clock_override
diff --git
a/tests/regression/kernel/test_clock_override
b/tests/regression/kernel/test_clock_override
index c52ddf100b25f30b05e6b1aadee6dfe434b57d16..1fbba7717884ce60252a7bc770a6876268d1082f 100755
(executable)
--- a/
tests/regression/kernel/test_clock_override
+++ b/
tests/regression/kernel/test_clock_override
@@
-49,11
+49,9
@@
source $TESTDIR/utils/utils.sh
function signal_cleanup()
{
diag "*** Exiting ***"
function signal_cleanup()
{
diag "*** Exiting ***"
- rmmod lttng-test
stop_lttng_sessiond
stop_lttng_sessiond
- rmmod lttng-clock-plugin-test
- rmmod lttng-clock
- exit 1
+ modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+ full_cleanup
}
function extract_clock_metadata()
}
function extract_clock_metadata()
@@
-76,8
+74,8
@@
function extract_clock_metadata_token()
function test_clock_override_metadata()
{
function test_clock_override_metadata()
{
- local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXX)
- local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXX)
+ local ctf_metadata_file=$(mktemp -p $TRACE_PATH ctf-metadata.XXXXX
X
)
+ local clock_metadata_file=$(mktemp -p $TRACE_PATH clock-metadata.XXXXX
X
)
local result=""
diag "Clock override plugin metadata test"
local result=""
diag "Clock override plugin metadata test"
@@
-93,12
+91,13
@@
function test_clock_override_metadata()
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_tracing_ok $SESSION_NAME
destroy_lttng_session_ok $SESSION_NAME
- rmmod lttng-test
stop_lttng_sessiond
stop_lttng_sessiond
- rmmod lttng-clock-plugin-test
- rmmod lttng-clock
+ modprobe -r lttng-test lttng-clock-plugin-test lttng-clock
+
+ local TRACE_METADATA_FILE_PATH="$(find "$TRACE_PATH" -name metadata -type f)"
+ local TRACE_METADATA_DIR="$(dirname "$TRACE_METADATA_FILE_PATH")"
- $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_
PATH
+ $BABELTRACE_BIN -o ctf-metadata -w $ctf_metadata_file $TRACE_
METADATA_DIR
ok $? "Metadata extraction from babeltrace"
extract_clock_metadata $ctf_metadata_file $clock_metadata_file
ok $? "Metadata extraction from babeltrace"
extract_clock_metadata $ctf_metadata_file $clock_metadata_file
This page took
0.036545 seconds
and
4
git commands to generate.