X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Frotation%2Ftest_kernel;h=f4019b46176d17bb476b0d9f0fd43aebefbca31f;hb=f0784451e9e671a1acd6eac0dc0c750a7d83b4eb;hp=6f5647f373ca723e76b430ab0182d6480b55265f;hpb=f0d43d3d8e0c7fcb01ba1550466517d047fd6e76;p=lttng-tools.git

diff --git a/tests/regression/tools/rotation/test_kernel b/tests/regression/tools/rotation/test_kernel
index 6f5647f37..f4019b461 100755
--- a/tests/regression/tools/rotation/test_kernel
+++ b/tests/regression/tools/rotation/test_kernel
@@ -1,30 +1,18 @@
 #!/bin/bash
 #
-# Copyright (C) - 2017 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2017 Julien Desfossez <jdesfossez@efficios.com>
 #
-# This library is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; version 2.1 of the License.
-#
-# This library is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-# FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more
-# details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+# SPDX-License-Identifier: LGPL-2.1-only
+
 TEST_DESC="Rotation - Kernel tracing"
 
 CURDIR=$(dirname $0)/
 TESTDIR=$CURDIR/../../..
 EVENT_NAME="lttng_test_filter_event"
-PID_RELAYD=0
-SESSION_NAME=""
 
 TRACE_PATH=$(mktemp -d)
 
-NUM_TESTS=68
+NUM_TESTS=60
 
 source $TESTDIR/utils/utils.sh
 source $CURDIR/rotate_utils.sh
@@ -50,14 +38,6 @@ function rotate_kernel_test ()
 
 	destroy_lttng_session_ok $SESSION_NAME
 
-	# The tests on the chunk folder rely on the date staying the same during
-	# the duration of the test, if this fail we will now why the other checks
-	# fail afterwards. There is a short window of time where an automated test
-	# could fail because of that.
-	now=$(date +%Y%m%d)
-	test $today = $now
-	ok $? "Date did not change during the test"
-
 	validate_test_chunks $local_path $today kernel kernel 0
 }
 
@@ -65,8 +45,7 @@ function test_kernel_streaming ()
 {
 	diag "Test kernel streaming with session rotation"
 	create_lttng_session_uri $SESSION_NAME net://localhost
-	rotate_kernel_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*"
-	clean_path $TRACE_PATH
+	rotate_kernel_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives"
 }
 
 function test_kernel_local ()
@@ -74,7 +53,7 @@ function test_kernel_local ()
 	diag "Test kernel local with session rotation"
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
-	rotate_kernel_test "${TRACE_PATH}"
+	rotate_kernel_test "${TRACE_PATH}/archives"
 }
 
 function test_kernel_local_timer ()
@@ -85,7 +64,7 @@ function test_kernel_local_timer ()
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 
-	rotate_timer_test "${TRACE_PATH}" 0
+	rotate_timer_test "${TRACE_PATH}/archives" 0
 }
 
 function test_kernel_streaming_timer ()
@@ -96,8 +75,7 @@ function test_kernel_streaming_timer ()
 	lttng_enable_rotation_timer_ok $SESSION_NAME 500ms
 	start_lttng_tracing_ok $SESSION_NAME
 
-	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*" 0
-	clean_path $TRACE_PATH
+	rotate_timer_test "${TRACE_PATH}/${HOSTNAME}/${SESSION_NAME}*/archives" 0
 }
 
 plan_tests $NUM_TESTS
@@ -124,6 +102,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
 	do
 		SESSION_NAME=$(randstring 16 0)
 		${fct_test}
+		clean_path $TRACE_PATH
 	done
 
 	rmmod lttng-test