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
/
tools
/
notification
/
test_notification_multi_app
diff --git
a/tests/regression/tools/notification/test_notification_multi_app
b/tests/regression/tools/notification/test_notification_multi_app
index 5d5427c9d03759eee3797cc326f8131c0457edec..a7156c4fea1dd31a95694476d5a86eac67fb046d 100755
(executable)
--- a/
tests/regression/tools/notification/test_notification_multi_app
+++ b/
tests/regression/tools/notification/test_notification_multi_app
@@
-14,7
+14,7
@@
TESTPOINT=$(readlink -f ${CURDIR}/.libs/libpause_consumer.so)
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
TESTAPP_PATH="$TESTDIR/utils/testapp"
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-TESTAPP_STATE_FILE="$(mktemp -u)"
+TESTAPP_STATE_FILE="$(mktemp -u
-t tmp.test_notification_multi_app_state_file.XXXXXX
)"
NR_ITER=1000
NR_USEC_WAIT=5
NR_ITER=1000
NR_USEC_WAIT=5
@@
-35,7
+35,7
@@
source $TESTDIR/utils/utils.sh
source $CURDIR/util_event_generator.sh
consumerd_pipe=()
source $CURDIR/util_event_generator.sh
consumerd_pipe=()
-file_sync_after_first_event=$(mktemp -u)
+file_sync_after_first_event=$(mktemp -u
-t tmp.test_notification_multi_app_sync_after_first.XXXXXX
)
# MUST set TESTDIR before calling those functions
plan_tests $NUM_TESTS
# MUST set TESTDIR before calling those functions
plan_tests $NUM_TESTS
@@
-54,9
+54,9
@@
function start_client {
local buffer_usage_threshold_type=$6
local buffer_usage_threshold_value=$7
local nr_expected_notification=$8
local buffer_usage_threshold_type=$6
local buffer_usage_threshold_value=$7
local nr_expected_notification=$8
- local use_action_
group
=$9
+ local use_action_
list
=$9
- ${CURDIR}/base_client ${session_name} ${channel_name} ${domain_type} ${buffer_usage_type} ${buffer_usage_threshold_type} ${buffer_usage_threshold_value} ${nr_expected_notification} ${use_action_
group
} > ${output_file} &
+ ${CURDIR}/base_client ${session_name} ${channel_name} ${domain_type} ${buffer_usage_type} ${buffer_usage_threshold_type} ${buffer_usage_threshold_value} ${nr_expected_notification} ${use_action_
list
} > ${output_file} &
pid=$!
app_pids+=("$pid")
pid=$!
app_pids+=("$pid")
@@
-135,10
+135,10
@@
function test_multi_app ()
local app_pids=()
local low_output_file_pattern="low_app_output_file_"
local high_output_file_pattern="high_app_output_file_"
local app_pids=()
local low_output_file_pattern="low_app_output_file_"
local high_output_file_pattern="high_app_output_file_"
- local output_dir=$(mktemp -d)
+ local output_dir=$(mktemp -d
-t "tmp.test_${FUNCNAME[0]}_output_dir.XXXXXX"
)
local testpoint_base_path=$(readlink -f "$output_dir/lttng.t_p_n_multi_app")
local testpoint_base_path=$(readlink -f "$output_dir/lttng.t_p_n_multi_app")
- local testpoint_pipe_path=$(
mktemp -u "${testpoint_base_path}
.XXXXXX")
+ local testpoint_pipe_path=$(
TMPDIR="$output_dir" mktemp -u -t "lttng.t_p_n_multi_app
.XXXXXX")
local nr_notification_expected=5
local nr_client_app=50
local nr_notification_expected=5
local nr_client_app=50
@@
-325,9
+325,9
@@
function test_on_register_evaluation ()
local app_pids=()
local high_output_file_pattern="high_app_output_file_on_register_evaluation"
local app_pids=()
local high_output_file_pattern="high_app_output_file_on_register_evaluation"
- local output_dir=$(mktemp -d)
+ local output_dir=$(mktemp -d
-t "tmp.test_${FUNCNAME[0]}_output_dir.XXXXXX"
)
local testpoint_base_path=$(readlink -f "$output_dir/lttng.t_p_n_register_evaluation")
local testpoint_base_path=$(readlink -f "$output_dir/lttng.t_p_n_register_evaluation")
- local testpoint_pipe_path=$(
mktemp -u "${testpoint_base_path}
.XXXXXX")
+ local testpoint_pipe_path=$(
TMPDIR="$output_dir" mktemp -u -t "lttng.t_p_n_register_evaluation
.XXXXXX")
local domain_string=""
local event_name=""
local domain_string=""
local event_name=""
@@
-411,26
+411,22
@@
function test_on_register_evaluation ()
rm -rf "$output_dir"
}
rm -rf "$output_dir"
}
-
TESTS=(
test_multi_app_ust
test_on_register_evaluation_ust
)
TESTS=(
test_multi_app_ust
test_on_register_evaluation_ust
)
-if [ "$(id -u)" == "0" ]; then
+check_skip_kernel_test "$NUM_TEST_KERNEL" "Skipping kernel multi-app notification tests." || {
validate_lttng_modules_present
TESTS+=(
validate_lttng_modules_present
TESTS+=(
- test_multi_app_kernel
- test_on_register_evaluation_kernel
-)
-else
- skip 0 "Root access is needed. Skipping all kernel multi-app notification tests." $NUM_TEST_KERNEL
-fi
-
+ test_multi_app_kernel
+ test_on_register_evaluation_kernel
+ )
+}
for fct_test in ${TESTS[@]};
do
for fct_test in ${TESTS[@]};
do
- TRACE_PATH=$(mktemp -d)
+ TRACE_PATH=$(mktemp -d
-t tmp.test_notification_multi_app_trace_path.XXXXXX
)
${fct_test}
if [ $? -ne 0 ]; then
${fct_test}
if [ $? -ne 0 ]; then
This page took
0.025387 seconds
and
4
git commands to generate.