X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fdestructive%2Fmetadata-regeneration;h=fed3426c9674a813c1cf7df87ddcb2fec17c9559;hp=de0d3dec0212088d50b00527e19199961f344d38;hb=b4b7369fbeb9c037449782132cfcdad1dac435d9;hpb=6c4a91d639747f260ab46decebc50998ef063712

diff --git a/tests/destructive/metadata-regeneration b/tests/destructive/metadata-regeneration
index de0d3dec0..fed3426c9 100755
--- 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
@@ -129,7 +119,7 @@ function test_ust_local ()
 
 	$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 &
+		--sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
 	start_lttng_tracing_ok $SESSION_NAME
 
@@ -167,7 +157,7 @@ function test_ust_streaming ()
 
 	$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 &
+		--sync-before-last-event ${file_sync_before_last} > /dev/null 2>&1 &
 
 	start_lttng_tracing_ok $SESSION_NAME
 
@@ -215,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