X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_ust;h=5d36e65836765a4749db715be4c4dd8f4f83dc74;hp=25654714f77af4243d16b9cff6d9a272199080bd;hb=a4c305246c4b8021fa1681076326731349a1cd17;hpb=308a89467c4dbfe218a9665bab82555dd88c07c9

diff --git a/tests/regression/tools/rotation/test_ust b/tests/regression/tools/rotation/test_ust
index 25654714f..5d36e6583 100755
--- a/tests/regression/tools/rotation/test_ust
+++ b/tests/regression/tools/rotation/test_ust
@@ -18,18 +18,16 @@ TEST_DESC="Rotation - User space tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
-NR_ITER=1
 NR_USEC_WAIT=0
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 SESSION_NAME="stream"
 EVENT_NAME="tp:tptest"
-PID_RELAYD=0
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=150
+NUM_TESTS=142
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -57,10 +55,10 @@ function rotate_ust_test ()
 	start_lttng_tracing_ok $SESSION_NAME
 	today=$(date +%Y%m%d)
 
-	$TESTAPP_BIN 10 $NR_USEC_WAIT /dev/null 2>&1
+	$TESTAPP_BIN -i 10 -w $NR_USEC_WAIT >/dev/null 2>&1
 	rotate_session_ok $SESSION_NAME
 
-	$TESTAPP_BIN 20 $NR_USEC_WAIT /dev/null 2>&1
+	$TESTAPP_BIN -i 20 -w $NR_USEC_WAIT >/dev/null 2>&1
 	stop_lttng_tracing_ok $SESSION_NAME
 
 	# Third chunk contains no event (rotate after stop).
@@ -68,14 +66,6 @@ function rotate_ust_test ()
 
 	destroy_lttng_session_ok $SESSION_NAME
 
-	# The tests on the chunk folder rely on the date staying the same during
-	# the duration of the test, if this fail we will now why the other checks
-	# fail afterwards. There is a short window of time where an automated test
-	# could fail because of that.
-	now=$(date +%Y%m%d)
-	test $today = $now
-	ok $? "Date did not change during the test"
-
 	validate_test_chunks "${local_path}" $today $app_path ust $per_pid
 }
 
@@ -86,7 +76,6 @@ function test_ust_streaming_uid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/uid/*/*/" 0
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_uid ()
@@ -96,7 +85,6 @@ function test_ust_local_uid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME
 
 	rotate_ust_test "${TRACE_PATH}" "ust/uid/*/*/" 0
-	clean_path $TRACE_PATH
 }
 
 function test_ust_streaming_pid ()
@@ -107,7 +95,6 @@ function test_ust_streaming_pid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
 	rotate_ust_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" "ust/pid/*/" 1
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_pid ()
@@ -118,7 +105,6 @@ function test_ust_local_pid ()
 	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME "channel0"
 
 	rotate_ust_test "${TRACE_PATH}" "ust/pid/*/" 1
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_uid ()
@@ -129,10 +115,9 @@ function test_ust_local_timer_uid ()
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 	# We just want the app to register, no event generated
-	$TESTAPP_BIN 0 0 /dev/null 2>&1
+	$TESTAPP_BIN -i 0 -w 0 >/dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}" 0
-	clean_path $TRACE_PATH
 }
 
 function test_ust_streaming_timer_uid ()
@@ -143,10 +128,9 @@ function test_ust_streaming_timer_uid ()
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 	# We just want the app to register, no event generated
-	$TESTAPP_BIN 0 0 /dev/null 2>&1
+	$TESTAPP_BIN -i 0 -w 0 >/dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-	clean_path $TRACE_PATH
 }
 
 function test_ust_local_timer_pid ()
@@ -158,10 +142,9 @@ function test_ust_local_timer_pid ()
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 	# We just want the app to register, no event generated
-	$TESTAPP_BIN 0 0 /dev/null 2>&1
+	$TESTAPP_BIN -i 0 -w 0 >/dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}" 1
-	clean_path $TRACE_PATH
 }
 
 function test_ust_streaming_timer_pid ()
@@ -173,10 +156,9 @@ function test_ust_streaming_timer_pid ()
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 	# We just want the app to register, no event generated
-	$TESTAPP_BIN 0 0 /dev/null 2>&1
+	$TESTAPP_BIN -i 0 -w 0 >/dev/null 2>&1
 
 	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 1
-	clean_path $TRACE_PATH
 }
 
 function test_incompatible_sessions ()
@@ -210,7 +192,6 @@ function test_incompatible_sessions ()
 	start_lttng_tracing_ok $SESSION_NAME
 	rotate_session_fail $SESSION_NAME
 	destroy_lttng_session_ok $SESSION_NAME
-
 }
 
 plan_tests $NUM_TESTS
@@ -230,6 +211,7 @@ for fct_test in ${tests[@]};
 do
 	SESSION_NAME=$(randstring 16 0)
 	${fct_test}
+	clean_path $TRACE_PATH
 done
 
 stop_lttng_sessiond