X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fcrash%2Ftest_crash;h=13909c1bfc04b7fe1d4c55168559240877a72e1a;hp=be61cda2fb2dfa4c0399829276144a020e862299;hb=c02a94c49b5473b218b93fbd9410129c8f8e903b;hpb=3e46b4ca56f63bddb99098556060898e07df8c06

diff --git a/tests/regression/tools/crash/test_crash b/tests/regression/tools/crash/test_crash
index be61cda2f..13909c1bf 100755
--- a/tests/regression/tools/crash/test_crash
+++ b/tests/regression/tools/crash/test_crash
@@ -31,7 +31,7 @@ NR_ITER=-1
 # Temp file output
 OUTPUT_DIR=$(mktemp -d)
 
-NUM_TESTS=71
+NUM_TESTS=77
 
 source $TESTDIR/utils/utils.sh
 
@@ -106,6 +106,8 @@ function test_shm_path_per_pid()
 	create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
 	enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-pid"
 
+	start_lttng_tracing_ok $session_name
+
 	diag "Shm: clean state"
 	file_count=$(find $shm_path -mindepth 1 -maxdepth 1 | wc -l)
 	test $file_count -eq "0"
@@ -174,6 +176,8 @@ function test_shm_path_per_uid()
 	create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
 	enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-uid"
 
+	start_lttng_tracing_ok $session_name
+
 	diag "Shm: test clean state"
 	file_count=$(find $shm_path -mindepth 1 -maxdepth 1 | wc -l)
 	test $file_count -eq "0"
@@ -229,7 +233,7 @@ function test_lttng_crash()
 
 	# Generate 10 events
 	$TESTAPP_BIN 10 0
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	crash_recup_count=$($LTTNG_CRASH $shm_path | wc -l)
 	test $crash_recup_count -eq "10"
@@ -267,7 +271,7 @@ function test_lttng_crash_extraction()
 	start_lttng_tracing_ok $session_name
 	# Generate 10 events
 	$TESTAPP_BIN 10 0
-	stop_lttng_tracing
+	stop_lttng_tracing_ok
 
 	$LTTNG_CRASH -x $extraction_path $shm_path
 	ok $? "Extraction of crashed buffers to path"
@@ -295,6 +299,8 @@ function test_shm_path_per_pid_sigint()
 	create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
 	enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-pid"
 
+	start_lttng_tracing_ok $session_name
+
 	start_test_app
 	start_test_app
 	shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
@@ -324,6 +330,8 @@ function test_shm_path_per_uid_sigint()
 	create_lttng_session_ok $session_name $OUTPUT_DIR "--shm-path $shm_path"
 	enable_ust_lttng_channel_ok $session_name $channel_name "--buffers-uid"
 
+	start_lttng_tracing_ok $session_name
+
 	start_test_app
 	start_test_app
 	shm_session_path=$(find $shm_path -mindepth 1 -maxdepth 1)
@@ -360,6 +368,9 @@ function test_lttng_crash_extraction_sigkill()
 	# Generate 10 events
 	$TESTAPP_BIN 10 0
 
+	sigstop_lttng_sessiond
+	sigstop_lttng_consumerd
+
 	# Kill the consumers then sessiond with sigkill
 	stop_lttng_consumerd SIGKILL
 	stop_lttng_sessiond SIGKILL