From: Christian Babeux <christian.babeux@efficios.com>
Date: Wed, 15 May 2013 18:04:10 +0000 (-0400)
Subject: Tests: Fix the number of tests in test_tracefile_count
X-Git-Tag: v2.2.0-rc3~62
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=d40d4ff64352b007a89343d69f8a2e27cbf9fade;p=lttng-tools.git

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 <christian.babeux@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

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