X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=tests%2Fregression%2Ftools%2Fstreaming%2Ftest_kernel;h=1e272c39aa92f0f48cd074b7b7637736e90c549a;hb=8679682ad868a019bc24702a661133e3157a9746;hp=42df7b0d50c00fbe8f0effc4a0d4b1cff737ad7f;hpb=d346ccad757068a5df142710ab5895f6ee93082b;p=lttng-tools.git

diff --git a/tests/regression/tools/streaming/test_kernel b/tests/regression/tools/streaming/test_kernel
index 42df7b0d5..1e272c39a 100755
--- a/tests/regression/tools/streaming/test_kernel
+++ b/tests/regression/tools/streaming/test_kernel
@@ -24,12 +24,10 @@ SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=11
+NUM_TESTS=10
 
 source $TESTDIR/utils/utils.sh
 
-print_test_banner "$TEST_DESC"
-
 # LTTng kernel modules check
 out=`ls /lib/modules/$(uname -r)/extra | grep lttng`
 if [ -z "$out" ]; then
@@ -54,13 +52,6 @@ function test_kernel_before_start ()
 	sleep 1
 	stop_lttng_tracing $SESSION_NAME
 	destroy_lttng_session $SESSION_NAME
-
-	# We can not predict _yet_ when the trace is available so we have to do a
-	# arbitratry sleep to validate the trace.
-	diag "Wait 3 seconds for the trace to be written on disk"
-	for i in `seq 1 3`; do
-		sleep 1
-	done
 }
 
 # Deactivated since this feature is not yet available where we can enable
@@ -79,6 +70,8 @@ function test_kernel_after_start ()
 
 plan_tests $NUM_TESTS
 
+print_test_banner "$TEST_DESC"
+
 if [ "$(id -u)" == "0" ]; then
 	isroot=1
 else
@@ -87,8 +80,8 @@ fi
 
 skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_TESTS ||
 {
-	start_lttng_sessiond
 	start_lttng_relayd "-o $TRACE_PATH"
+	start_lttng_sessiond
 
 	tests=( test_kernel_before_start )