X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fclear%2Ftest_ust;h=45abc9112f21ff212df58a2b27e353abba0d303f;hb=4942c25609805b81dc67ea4447eac7f9cddac655;hp=dcfc0ee0c855a413a6cf9211472dde90d4256a33;hpb=9d16b343fb9e781fc8d8fa3c448a3f382306dd33;p=lttng-tools.git

diff --git a/tests/regression/tools/clear/test_ust b/tests/regression/tools/clear/test_ust
index dcfc0ee0c..45abc9112 100755
--- a/tests/regression/tools/clear/test_ust
+++ b/tests/regression/tools/clear/test_ust
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (C) 2019 Jonathan Rajotte-Julien <jonathan.rajotte-julien@efficios.com>
+# Copyright (C) 2019 Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
 #
 # SPDX-License-Identifier: LGPL-2.1-only
 
@@ -14,7 +14,7 @@ TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
 TESTAPP_BIN="$TESTAPP_PATH/$TESTAPP_NAME/$TESTAPP_NAME"
 
-NUM_TESTS=1683
+NUM_TESTS=1915
 
 PAGE_SIZE=$(getconf PAGE_SIZE)
 TRACE_PATH=$(mktemp -d)
@@ -113,6 +113,31 @@ function test_ust_streaming ()
 	destroy_lttng_session_ok $SESSION_NAME
 }
 
+function test_ust_streaming_no_event ()
+{
+	local tracing_active=$1
+	local clear_twice=$2
+	#local rotate_before=$3 ignored
+	#local rotate_after=$4
+	local buffer_type=uid
+	local local_path="${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*"
+	local channel_name="chan"
+
+	diag "Test ust streaming clear no event"
+	diag "Parameters: tracing_active=$tracing_active, clear_twice=$clear_twice, rotate_before=$rotate_before, rotate_after=$rotate_after, buffer_type=$buffer_type"
+	create_lttng_session_uri $SESSION_NAME net://localhost
+	enable_ust_lttng_channel_ok $SESSION_NAME $channel_name --buffers-$buffer_type
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $channel_name
+	start_lttng_tracing_ok $SESSION_NAME
+
+	do_clear_session $SESSION_NAME "$tracing_active" "$clear_twice" "$rotate_before" "$rotate_after"
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	validate_directory_empty "$local_path"
+
+	destroy_lttng_session_ok $SESSION_NAME
+}
+
 function test_ust_streaming_rotate_clear ()
 {
 	local tracing_active=$1
@@ -198,7 +223,11 @@ function test_ust_streaming_live ()
 	do_clear_session $SESSION_NAME $tracing_active $clear_twice 0 0
 	stop_lttng_tracing_ok $SESSION_NAME
 
-	validate_directory_empty $local_path
+	if [[ "$buffer_type" == "uid" ]]; then
+		validate_trace_empty $local_path
+	else	# pid
+		validate_directory_empty $local_path
+	fi
 
 	destroy_lttng_session_ok $SESSION_NAME
 }
@@ -320,13 +349,40 @@ function test_ust_local ()
 		if [[ "$buffer_type" == "uid" ]]; then
 			validate_trace_empty $TRACE_PATH
 		else	# pid
-			validate_directory_empty $TRACE_PATH
+
+			# The sessiond always created a `ust/ directory
+			# whenever the UST domain is active
+			validate_directory_empty $TRACE_PATH/ust/
 		fi
 	fi
 
 	destroy_lttng_session_ok $SESSION_NAME
 }
 
+function test_ust_local_no_event ()
+{
+	local tracing_active=$1
+	local clear_twice=$2
+	#local rotate_before=$3 ignored
+	#local rotate_after=$4 ignored
+	local buffer_type=$5
+	local channel_name="chan"
+
+	diag "Test ust local no event"
+	diag "Parameters: tracing_active=$tracing_active, clear_twice=$clear_twice, rotate_before=$rotate_before, rotate_after=$rotate_after, buffer_type=$buffer_type"
+	create_lttng_session_ok $SESSION_NAME "$TRACE_PATH"
+	enable_ust_lttng_channel_ok $SESSION_NAME $channel_name "--buffers-$buffer_type"
+	enable_ust_lttng_event_ok $SESSION_NAME $EVENT_NAME $channel_name
+	start_lttng_tracing_ok $SESSION_NAME
+
+	do_clear_session $SESSION_NAME "$tracing_active" "$clear_twice" "$rotate_before" "$rotate_after"
+	stop_lttng_tracing_ok $SESSION_NAME
+
+	validate_directory_empty "$TRACE_PATH"
+
+	destroy_lttng_session_ok $SESSION_NAME
+}
+
 function test_ust_local_rotate_clear ()
 {
 	local tracing_active=$1
@@ -665,6 +721,7 @@ streaming_tests=(test_ust_streaming
 	test_ust_streaming_clear_rotate
 	test_ust_streaming_tracefile_rotation
 	test_ust_streaming_tracefile_rotation_overwrite_files
+	test_ust_streaming_no_event
 )
 
 live_tests=(test_ust_streaming_live
@@ -675,6 +732,7 @@ live_tests=(test_ust_streaming_live
 local_tests=(test_ust_local
 	test_ust_local_rotate_clear
 	test_ust_local_clear_rotate
+	test_ust_local_no_event
 )
 
 snapshot_uid_tests=(test_ust_streaming_snapshot