projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: add check_skip_kernel_test to check root user and lttng kernel modules
[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 8f471def8b6053da7b4713f99233f03d0cccc90e..c3688d3599efa28aed83d8eab7483ba44934bd78 100755
(executable)
--- a/
tests/regression/kernel/test_clock_override
+++ b/
tests/regression/kernel/test_clock_override
@@
-64,8
+64,8
@@
function extract_clock_metadata_token()
function test_clock_override_metadata()
{
function test_clock_override_metadata()
{
- local ctf_metadata_file=$(
mktemp --tmpdir -p $TRACE_PATH
ctf-metadata.XXXXXX)
- local clock_metadata_file=$(
mktemp --tmpdir -p $TRACE_PATH
clock-metadata.XXXXXX)
+ local ctf_metadata_file=$(
TMPDIR="$TRACE_PATH" mktemp -t
ctf-metadata.XXXXXX)
+ local clock_metadata_file=$(
TMPDIR="$TRACE_PATH" mktemp -t
clock-metadata.XXXXXX)
local result=""
diag "Clock override plugin metadata test"
local result=""
diag "Clock override plugin metadata test"
@@
-149,7
+149,7
@@
function test_clock_override_timestamp()
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
destroy_lttng_session_ok $SESSION_NAME
stop_lttng_sessiond
- modprobe --remove lttng-
clock-plugin-test lttng-clock lttng-test
+ modprobe --remove lttng-
test lttng-clock-plugin-test lttng-clock
# Use Babeltrace with "-n all" to give a comma separated list for
# easy extraction of timestamps.
# Use Babeltrace with "-n all" to give a comma separated list for
# easy extraction of timestamps.
@@
-174,20
+174,14
@@
TESTS=(
TEST_COUNT=${#TESTS[@]}
i=0
TEST_COUNT=${#TESTS[@]}
i=0
-if [ "$(id -u)" == "0" ]; then
- isroot=1
-else
- isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
{
validate_lttng_modules_present
trap signal_cleanup SIGTERM SIGINT
while [ "$i" -lt "$TEST_COUNT" ]; do
{
validate_lttng_modules_present
trap signal_cleanup SIGTERM SIGINT
while [ "$i" -lt "$TEST_COUNT" ]; do
- TRACE_PATH=$(mktemp -
-tmpdir -d
tmp.test_clock_override_trace_path.XXXXXX)
+ TRACE_PATH=$(mktemp -
d -t
tmp.test_clock_override_trace_path.XXXXXX)
# Execute test
${TESTS[$i]}
# Execute test
${TESTS[$i]}
This page took
0.038729 seconds
and
4
git commands to generate.