X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_kernel;h=b0143819a523c8d86066bf35a91f68e5251790aa;hb=962971d24e31ba0a82094e1786a2bfce124cc29f;hp=1849b9cd0b10c9ea66bbbcb5a8ebe92ac03e956a;hpb=9c8a396496a28702730192ae1ded06105c54c5dc;p=lttng-tools.git

diff --git a/tests/regression/tools/regen-metadata/test_kernel b/tests/regression/tools/regen-metadata/test_kernel
index 1849b9cd0..b0143819a 100755
--- a/tests/regression/tools/regen-metadata/test_kernel
+++ b/tests/regression/tools/regen-metadata/test_kernel
@@ -19,58 +19,71 @@ TEST_DESC="Streaming - Kernel tracing"
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
-PID_RELAYD=0
 SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=18
+NUM_TESTS=24
 
 source $TESTDIR/utils/utils.sh
 
-function lttng_create_session_uri
-{
-	# Create session with default path
-	$TESTDIR/../src/bin/lttng/$LTTNG_BIN create $SESSION_NAME -U net://localhost >/dev/null 2>&1
-
-	ok $? "Create session $SESSION_NAME"
-}
-
 function test_kernel_streaming ()
 {
+	local metadata_path
+
 	diag "Test kernel streaming with metadata regeneration"
-	lttng_create_session_uri
+	create_lttng_session_uri $SESSION_NAME net://localhost
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing_ok $SESSION_NAME
 	echo -n "100" > /proc/lttng-test-filter-event
+
+	# Baseline
+	stop_lttng_tracing_ok $SESSION_NAME
+	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
+
+	# Find the metadata file
+	metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* | grep metadata)
+
+	# Empty the metadata file
+	echo -n > "$metadata_path"
+
+	start_lttng_tracing_ok $SESSION_NAME
 	regenerate_metadata_ok $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
 	# Validate test
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $TRACE_PATH
-	else
-		break
-	fi
 	destroy_lttng_session_ok $SESSION_NAME
+	rm -rf "$TRACE_PATH"
 }
 
 function test_kernel_local ()
 {
+	local metadata_path
+
 	diag "Test kernel local with metadata regeneration"
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 	lttng_enable_kernel_event $SESSION_NAME $EVENT_NAME
 	start_lttng_tracing_ok $SESSION_NAME
+
+	# Baseline
 	echo -n "100" > /proc/lttng-test-filter-event
+	stop_lttng_tracing_ok $SESSION_NAME
+	validate_trace $EVENT_NAME "$TRACE_PATH"
+
+	# Find the metadata file
+	metadata_path=$(find "$TRACE_PATH"* | grep metadata)
+
+	# Empty the metadata file
+	echo -n > "$metadata_path"
+
+	start_lttng_tracing_ok $SESSION_NAME
 	regenerate_metadata_ok $SESSION_NAME
 	stop_lttng_tracing_ok $SESSION_NAME
+
 	validate_trace $EVENT_NAME $TRACE_PATH
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $TRACE_PATH
-	fi
 	destroy_lttng_session_ok $SESSION_NAME
+
+	rm -rf "$TRACE_PATH"
 }
 
 plan_tests $NUM_TESTS
@@ -99,7 +112,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 		${fct_test}
 	done
 
-	rmmod lttng-test
+	modprobe --remove lttng-test
 	stop_lttng_sessiond
 	stop_lttng_relayd
 }