From d40d4ff64352b007a89343d69f8a2e27cbf9fade Mon Sep 17 00:00:00 2001 From: Christian Babeux Date: Wed, 15 May 2013 14:04:10 -0400 Subject: [PATCH] Tests: Fix the number of tests in test_tracefile_count The number of planned tests is dependent on the number of streams (1 per cpu). Signed-off-by: Christian Babeux Signed-off-by: David Goulet --- .../tools/tracefile-limits/test_tracefile_count | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/tests/regression/tools/tracefile-limits/test_tracefile_count b/tests/regression/tools/tracefile-limits/test_tracefile_count index 41b89f005..0c23d843b 100755 --- 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" -NUM_TESTS=146 +NUM_TESTS=82 + +NUM_CPUS=`nproc` source $TESTDIR/utils/utils.sh @@ -134,9 +136,7 @@ function test_tracefile_count_limit () # 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 @@ -158,14 +158,17 @@ function test_tracefile_count_limit () 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 -LIMITS=("1" "2" "4" "8" "10" "16" "32" "64") - for limit in ${LIMITS[@]}; do test_tracefile_count_limit $limit -- 2.34.1