Cleanup: tests: name all temporary files to better identify leakage

[lttng-tools.git] / tests / destructive / metadata-regeneration

diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration
index 32469b5b4390e0d57cd530ab0cacbfb17a6238bb..b81e7af32d22d1c1614f8c55409392d61e28711f 100755 (executable)
--- a/tests/destructive/metadata-regeneration
+++ b/tests/destructive/metadata-regeneration
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2015 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2015 Julien Desfossez <jdesfossez@efficios.com>
 #
-# This program is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License, version 2 only, as
-# published by the Free Software Foundation.
+# SPDX-License-Identifier: GPL-2.0-only
 #
-# This program 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 General Public License for
-# more details.
-#
-# You should have received a copy of the GNU General Public License along with
-# this program; if not, write to the Free Software Foundation, Inc., 51
-# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # WARNING: this test changes the date of the system (and does not set it back).
 # This test sets the date of the current machine to $DATE1, creates a trace
@@ -28,7 +18,7 @@ TESTDIR=$CURDIR/..
 NUM_TESTS=44
 SESSION_NAME="regen"
 KERNEL_EVENT_NAME="lttng_test_filter_event"
-TRACE_PATH=$(mktemp -d)
+TRACE_PATH=$(mktemp --tmpdir -d -t tmp.metadata_regen_after_data_change.XXXXXX)
 
 TESTAPP_PATH="$TESTDIR/utils/testapp"
 TESTAPP_NAME="gen-ust-events"
@@ -48,13 +38,6 @@ plan_tests $NUM_TESTS
 
 print_test_banner "$TEST_DESC"
 
-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 with default path"
-}
-
 function validate_trace_date
 {
        local test_date=$1
@@ -89,7 +72,7 @@ function test_kernel_local ()
        validate_trace_date $DATE1 $TRACE_PATH
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
        validate_trace_date $DATE2 $TRACE_PATH
        if [ $? -eq 0 ]; then
@@ -103,7 +86,7 @@ function test_kernel_streaming ()
 {
        diag "Test kernel streaming with metadata regeneration"
        date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        lttng_enable_kernel_event $SESSION_NAME $KERNEL_EVENT_NAME
        start_lttng_tracing_ok $SESSION_NAME
        echo -n "100" > /proc/lttng-test-filter-event
@@ -111,7 +94,7 @@ function test_kernel_streaming ()
        validate_trace_date $DATE1 $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
        stop_lttng_tracing_ok $SESSION_NAME
        # Validate test
        validate_trace_date $DATE2 $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
@@ -126,15 +109,17 @@ function test_kernel_streaming ()
 
 function test_ust_local ()
 {
-       local file_sync_after_first=$(mktemp -u)
-       local file_sync_before_last=$(mktemp -u)
+       local file_sync_after_first=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+       local file_sync_before_last=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
        diag "Test UST local with metadata regeneration"
        date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
        create_lttng_session_ok $SESSION_NAME $TRACE_PATH
        enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
        start_lttng_tracing_ok $SESSION_NAME
 
@@ -147,7 +132,7 @@ function test_ust_local ()
 
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -162,15 +147,17 @@ function test_ust_local ()
 
 function test_ust_streaming ()
 {
-       local file_sync_after_first=$(mktemp -u)
-       local file_sync_before_last=$(mktemp -u)
+       local file_sync_after_first=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_after_first.XXXXXX")
+       local file_sync_before_last=$(mktemp --tmpdir -u -t "tmp.${FUNCNAME[0]}_sync_before_last.XXXXXX")
 
        diag "Test UST streaming with metadata regeneration"
        date "+%Y-%m-%d %H:%M" -s "$DATE1 $HOUR" >/dev/null
-       lttng_create_session_uri
+       create_lttng_session_uri $SESSION_NAME net://localhost
        enable_ust_lttng_event_ok $SESSION_NAME $UST_EVENT_NAME
 
-       $TESTAPP_BIN $NR_ITER $NR_USEC_WAIT ${file_sync_after_first} ${file_sync_before_last} /dev/null 2>&1 &
+       $TESTAPP_BIN -i $NR_ITER -w $NR_USEC_WAIT \
+               --sync-after-first-event ${file_sync_after_first} \
+               --sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
        start_lttng_tracing_ok $SESSION_NAME
 
@@ -184,7 +171,7 @@ function test_ust_streaming ()
        start_lttng_tracing_ok $SESSION_NAME
        date "+%Y-%m-%d %H:%M" -s "$DATE2 $HOUR" >/dev/null
 
-       metadata_regenerate_ok $SESSION_NAME
+       regenerate_metadata_ok $SESSION_NAME
 
        stop_lttng_tracing_ok $SESSION_NAME
        destroy_lttng_session_ok $SESSION_NAME
@@ -218,7 +205,7 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
        modprobe lttng-test
        test_kernel_local
        test_kernel_streaming
-       rmmod lttng-test
+       modprobe --remove lttng-test
 
        test_ust_local
        test_ust_streaming