projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactor: test: wrapper for create_lttng_session
[lttng-tools.git]
/
tests
/
regression
/
tools
/
tracefile-limits
/
test_tracefile_count
diff --git
a/tests/regression/tools/tracefile-limits/test_tracefile_count
b/tests/regression/tools/tracefile-limits/test_tracefile_count
index 41b89f005df2e673faf4640c3fbee1da44742df3..8dfcbad739a3b7fe4c33a6f6e38cd868dc4b2c9d 100755
(executable)
--- a/
tests/regression/tools/tracefile-limits/test_tracefile_count
+++ b/
tests/regression/tools/tracefile-limits/test_tracefile_count
@@
-25,7
+25,9
@@
TESTAPP_NAME="gen-ust-events"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
STATS_BIN="$TESTDIR/utils/babelstats.pl"
TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
STATS_BIN="$TESTDIR/utils/babelstats.pl"
-NUM_TESTS=146
+NUM_TESTS=74
+
+NUM_CPUS=`nproc`
source $TESTDIR/utils/utils.sh
source $TESTDIR/utils/utils.sh
@@
-33,14
+35,6
@@
if [ ! -x "$TESTAPP_BIN" ]; then
BAIL_OUT "No UST events binary detected."
fi
BAIL_OUT "No UST events binary detected."
fi
-function wait_apps
-{
- while [ -n "$(pidof $TESTAPP_NAME)" ]; do
- sleep 0.5
- done
- pass "Wait for applications to end"
-}
-
function enable_lttng_channel_count_limit ()
{
sess_name="$1"
function enable_lttng_channel_count_limit ()
{
sess_name="$1"
@@
-92,7
+86,7
@@
function validate_file_count
file_pattern="$2"
expected_max_count="$3"
file_pattern="$2"
expected_max_count="$3"
- count=`find $path -name "$file_pattern" -type f | wc -l`
+ count=`find $path -name "$file_pattern" -type f
\( ! -iname "*.idx" \)
| wc -l`
if [ "$count" -gt "$expected_max_count" ]; then
fail "Validate file count: $file_pattern"
if [ "$count" -gt "$expected_max_count" ]; then
fail "Validate file count: $file_pattern"
@@
-114,7
+108,7
@@
function test_tracefile_count_limit ()
diag "Test tracefile count limit : $count_limit tracefiles"
diag "Test tracefile count limit : $count_limit tracefiles"
- create_lttng_session $session_name $trace_path
+ create_lttng_session
_ok
$session_name $trace_path
enable_lttng_channel_count_limit \
$session_name $channel_name $count_limit
enable_lttng_channel_count_limit \
$session_name $channel_name $count_limit
@@
-124,9
+118,7
@@
function test_tracefile_count_limit ()
start_lttng_tracing $session_name
start_lttng_tracing $session_name
- $TESTAPP_BIN $num_iter >/dev/null 2>&1 &
-
- wait_apps
+ $TESTAPP_BIN $num_iter >/dev/null 2>&1
stop_lttng_tracing $session_name
stop_lttng_tracing $session_name
@@
-134,9
+126,7
@@
function test_tracefile_count_limit ()
# Validate tracing dir
# Validate tracing dir
- num_cpu=`nproc`
-
- for cpuno in $(seq 0 $(($num_cpu - 1)))
+ for cpuno in $(seq 0 $(($NUM_CPUS - 1)))
do
validate_file_count \
$trace_path "${channel_name}_${cpuno}_*" $count_limit
do
validate_file_count \
$trace_path "${channel_name}_${cpuno}_*" $count_limit
@@
-158,14
+148,17
@@
function test_tracefile_count_limit ()
rm -rf $trace_path
}
rm -rf $trace_path
}
-plan_tests $NUM_TESTS
+LIMITS=("1" "2" "4" "8" "10" "16" "32" "64")
+
+# The file count validation depends on the number of streams (1 per cpu)
+TOTAL_TESTS=$(($NUM_TESTS + (${#LIMITS[@]} * $NUM_CPUS)))
+
+plan_tests $TOTAL_TESTS
print_test_banner "$TEST_DESC"
start_lttng_sessiond
print_test_banner "$TEST_DESC"
start_lttng_sessiond
-LIMITS=("1" "2" "4" "8" "10" "16" "32" "64")
-
for limit in ${LIMITS[@]};
do
test_tracefile_count_limit $limit
for limit in ${LIMITS[@]};
do
test_tracefile_count_limit $limit
This page took
0.026557 seconds
and
4
git commands to generate.