Tests: do not bound test app iterations when in background mode
authorJonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Tue, 3 Jul 2018 18:49:23 +0000 (14:49 -0400)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Tue, 11 Sep 2018 19:13:43 +0000 (15:13 -0400)
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>
tests/regression/tools/snapshots/test_ust_streaming
tests/regression/tools/snapshots/ust_test

index 38ffba09c71f448e2b13820ed364b724bad78948..c97813e40eec6738284682f621904fc4e2ee59ab 100755 (executable)
@@ -25,7 +25,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=
 
index 54321817dc28fe575b5d62dedbb6278c52dd6f72..1e01eb21e2bf1b0c5d2a84677893985ca42b5dad 100755 (executable)
@@ -156,8 +156,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
@@ -187,7 +185,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"
@@ -306,7 +304,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)
@@ -359,8 +357,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"
@@ -388,8 +384,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
 
@@ -399,6 +393,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
@@ -425,7 +421,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"
@@ -453,7 +449,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"
This page took 0.039664 seconds and 5 git commands to generate.