X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fregen-metadata%2Ftest_ust;h=2a761307409f1ed594e4f0f71d75b6bf0e24f4e0;hp=2144b835a4066c0caa46ba9845880f118e58ee53;hb=dbbc5b0a971a544a1b79dcf9d172259140dd7ac5;hpb=55954e07e828c0ec1c059a50996252a358f7dd23

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index 2144b835a..2a7613074 100755
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -18,7 +18,7 @@ EVENT_NAME="tp:tptest"
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=33
+NUM_TESTS=39
 
 source $TESTDIR/utils/utils.sh
 
@@ -41,6 +41,7 @@ function test_ust_streaming ()
 {
 	local file_sync_after_first=$(mktemp -u)
 	local file_sync_before_last=$(mktemp -u)
+	local metadata_path
 
 	diag "Test UST streaming with metadata regeneration"
 	create_lttng_session_uri $SESSION_NAME net://localhost
@@ -56,16 +57,26 @@ function test_ust_streaming ()
 
 	# Wait for the applications started in background
 	wait
-	regenerate_metadata_ok $SESSION_NAME
 
+	# Expect a valid trace
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session_ok $SESSION_NAME
-	# Validate test
+	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
+
+	# Metadata file must have been regenerated
 	validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
-	if [ $? -eq 0 ]; then
-		# Only delete if successful
-		rm -rf $TRACE_PATH
-	fi
+	destroy_lttng_session_ok $SESSION_NAME
+
+	rm -rf "$TRACE_PATH"
 	rm -f ${file_sync_after_first}
 	rm -f ${file_sync_before_last}
 }
@@ -74,6 +85,7 @@ function test_ust_local ()
 {
 	local file_sync_after_first=$(mktemp -u)
 	local file_sync_before_last=$(mktemp -u)
+	local metadata_path
 
 	diag "Test UST local with metadata regeneration"
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
@@ -89,16 +101,26 @@ function test_ust_local ()
 
 	# Wait for the applications started in background
 	wait
-	regenerate_metadata_ok $SESSION_NAME
 
+	# Expect a valid trace
 	stop_lttng_tracing_ok $SESSION_NAME
-	destroy_lttng_session_ok $SESSION_NAME
-	# Validate test
+	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
+
+	# Metadata file must have been regenerated
 	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"
 	rm -f ${file_sync_after_first}
 	rm -f ${file_sync_before_last}
 }