X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_select_poll_epoll;h=16b0da525c4fae8cf394aa57729dd84bb24641d6;hb=46fd07accf36998fca3e43e54513755a98f68f48;hp=e01866f75dcf22c0f0b6a603b9fffa08ee517ccc;hpb=a0b1f42c19b7ea6bcce77b33f4581ca5b3ac56e5;p=lttng-tools.git

diff --git a/tests/regression/kernel/test_select_poll_epoll b/tests/regression/kernel/test_select_poll_epoll
index e01866f75..16b0da525 100755
--- a/tests/regression/kernel/test_select_poll_epoll
+++ b/tests/regression/kernel/test_select_poll_epoll
@@ -1,19 +1,9 @@
 #!/bin/bash
 #
-# Copyright (C) - 2016 Julien Desfossez <jdesfossez@efficios.com>
+# Copyright (C) 2016 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.
 
 TEST_DESC="Kernel tracer - select, poll and epoll payload extraction"
 
@@ -62,7 +52,7 @@ function check_trace_content()
 
 function test_working_cases()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 
 	# arm64 does not have epoll_wait
@@ -95,7 +85,7 @@ function test_working_cases()
 
 function test_timeout_cases()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 
 	# arm64 does not have epoll_wait
@@ -126,13 +116,13 @@ function test_timeout_cases()
 	rm -rf $TRACE_PATH
 }
 
-function test_big_pselect()
+function test_pselect_invalid_fd()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="pselect6"
 
-	diag "pselect with a FD > 1023"
+	diag "pselect with invalid FD"
 
 	create_lttng_session_ok $SESSION_NAME $TRACE_PATH
 
@@ -154,7 +144,7 @@ function test_big_pselect()
 
 function test_big_ppoll()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="ppoll"
 
@@ -180,7 +170,7 @@ function test_big_ppoll()
 
 function test_ppoll_overflow()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="ppoll"
 
@@ -209,7 +199,7 @@ function test_ppoll_overflow()
 
 function test_pselect_invalid_ptr()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="pselect6"
 
@@ -235,7 +225,7 @@ function test_pselect_invalid_ptr()
 
 function test_ppoll_ulong_max()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="ppoll"
 
@@ -261,7 +251,7 @@ function test_ppoll_ulong_max()
 
 function test_epoll_pwait_invalid_ptr()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="epoll_pwait"
 
@@ -287,7 +277,7 @@ function test_epoll_pwait_invalid_ptr()
 
 function test_epoll_pwait_int_max()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="epoll_pwait"
 
@@ -313,7 +303,7 @@ function test_epoll_pwait_int_max()
 
 function test_ppoll_concurrent()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="ppoll"
 
@@ -339,7 +329,7 @@ function test_ppoll_concurrent()
 
 function test_epoll_pwait_concurrent()
 {
-	TRACE_PATH=$(mktemp -d)
+	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	SESSION_NAME="syscall_payload"
 	SYSCALL_LIST="epoll_ctl,epoll_pwait"
 
@@ -384,7 +374,7 @@ skip $isroot "Root access is needed. Skipping all tests." $NUM_TESTS ||
 
 	test_working_cases
 	test_timeout_cases
-	test_big_pselect
+	test_pselect_invalid_fd
 	test_big_ppoll
 	test_ppoll_overflow
 	test_pselect_invalid_ptr