From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Tue, 3 Jul 2018 18:49:23 +0000 (-0400)
Subject: Tests: do not bound test app iterations when in background mode
X-Git-Tag: v2.9.11~22
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8ce91bb0e7865ee5ca627935e6249f3862aa9436;p=lttng-tools.git

Tests: do not bound test app iterations when in background mode

On systems with a high number of CPUs and slow disk, taking snapshots
can take a long time. When running a long regression test, the tests
sometimes outlive the test application.

The test application then exits since the required number of
iterations was completed
(NR_ITER=2000000).

Set the iterations parameter to -1 to ensure the application keeps
producing events for the duration of the test.

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming
index c412ef71b..9c416648c 100755
--- a/tests/regression/tools/snapshots/test_ust_streaming
+++ b/tests/regression/tools/snapshots/test_ust_streaming
@@ -26,7 +26,7 @@ BIN_NAME="gen-nevents"
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
-NR_ITER=2000000
+NR_ITER=-1
 NR_USEC_WAIT=100
 APPS_PID=
 
diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test
index 287ee24bf..755cef9e0 100755
--- a/tests/regression/tools/snapshots/ust_test
+++ b/tests/regression/tools/snapshots/ust_test
@@ -157,8 +157,6 @@ function enable_mmap_small_overwrite_ust_channel ()
 function test_ust_list_output ()
 {
 	output_names=("randomname" "somesnapshot")
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 
 	diag "Test UST snapshot output listing"
 	create_lttng_session_no_output $SESSION_NAME
@@ -188,7 +186,7 @@ function test_ust_list_output ()
 
 function test_ust_local_snapshot ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test local UST snapshots"
@@ -307,7 +305,7 @@ function test_ust_local_snapshot_small_overwrite_buffers ()
 
 function test_ust_local_snapshot_max_size ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 	page_size=`getconf PAGE_SIZE`
 	num_cpus=$(conf_proc_count)
@@ -360,8 +358,6 @@ function test_ust_local_snapshot_max_size ()
 
 function test_ust_local_snapshot_large_metadata ()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 	LM_EVENT="tp:tptest1,tp:tptest2,tp:tptest3,tp:tptest4,tp:tptest5"
 	LM_PATH="$TESTDIR/utils/testapp"
 	LM_NAME="gen-ust-nevents"
@@ -389,8 +385,6 @@ function test_ust_local_snapshot_large_metadata ()
 
 function enable_channel_per_uid_mmap_overwrite()
 {
-	NR_ITER=2000000
-	NR_USEC_WAIT=100
 	sess_name=$1
 	channel_name=$2
 
@@ -400,6 +394,8 @@ function enable_channel_per_uid_mmap_overwrite()
 
 function test_ust_per_uid_local_snapshot ()
 {
+	NR_ITER=-1
+	NR_USEC_WAIT=100
 	diag "Test per-uid local UST snapshots"
 	create_lttng_session_no_output $SESSION_NAME
 	enable_channel_per_uid_mmap_overwrite $SESSION_NAME $CHANNEL_NAME
@@ -426,7 +422,7 @@ function test_ust_per_uid_local_snapshot ()
 
 function test_ust_per_uid_local_snapshot_post_mortem ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test local UST snapshots post-mortem"
@@ -454,7 +450,7 @@ function test_ust_per_uid_local_snapshot_post_mortem ()
 
 function test_ust_local_snapshots ()
 {
-	NR_ITER=2000000
+	NR_ITER=-1
 	NR_USEC_WAIT=100
 
 	diag "Test $NR_SNAPSHOT local UST snapshots"