From 18c9d47c32d019535b6ef12ed84e3eb220f6060d Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Tue, 3 Jul 2018 14:49:23 -0400 Subject: [PATCH] Tests: do not bound test app iterations when in background mode MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jérémie Galarneau --- .../tools/snapshots/test_ust_streaming | 2 +- tests/regression/tools/snapshots/ust_test | 16 ++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/tests/regression/tools/snapshots/test_ust_streaming b/tests/regression/tools/snapshots/test_ust_streaming index 38ffba09c..c97813e40 100755 --- a/tests/regression/tools/snapshots/test_ust_streaming +++ b/tests/regression/tools/snapshots/test_ust_streaming @@ -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= diff --git a/tests/regression/tools/snapshots/ust_test b/tests/regression/tools/snapshots/ust_test index 54321817d..1e01eb21e 100755 --- a/tests/regression/tools/snapshots/ust_test +++ b/tests/regression/tools/snapshots/ust_test @@ -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" -- 2.34.1