X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Fkernel%2Ftest_callstack;h=ecbba30661f0ee233a83400848fc0eb6ba751c0c;hp=9e554bbc0d538859ac1bf94d8d0174292210b733;hb=HEAD;hpb=0159fa50ebb4c8ea0e34a24f99bc8f5cda298be4

diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack
index 9e554bbc0..960bb8a44 100755
--- a/tests/regression/kernel/test_callstack
+++ b/tests/regression/kernel/test_callstack
@@ -9,7 +9,7 @@ TEST_DESC="Kernel tracer - Callstack context"
 
 CURDIR=$(dirname "$0")/
 TESTDIR=$CURDIR/../..
-NUM_TESTS=11
+NUM_TESTS=12
 TEST_APP_USERSPACE="$TESTDIR/utils/testapp/gen-syscall-events-callstack/gen-syscall-events-callstack"
 TEST_APP_KERNELSPACE="$TESTDIR/utils/testapp/gen-syscall-events/gen-syscall-events"
 PARSE_CALLSTACK="$TESTDIR/utils/parse-callstack.py"
@@ -36,7 +36,7 @@ function run_workload()
 	# shift the first argument, passing along the other args if any to the
 	# test app.
 	shift
-	local start_file_sync=$(mktemp --tmpdir -u "tmp.${FUNCNAME[0]}_sync_before_first.XXXXXX")
+	local start_file_sync=$(mktemp -u -t "tmp.${FUNCNAME[0]}_sync_before_first.XXXXXX")
 
 	lttng_untrack_all
 
@@ -60,7 +60,7 @@ function run_workload()
 
 function test_user_callstack()
 {
-	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	# This is the expected userspace callstack. (see gen-syscall-events-callstack.c)
 	USER_CS_EXPECTED="main fct_a fct_b fct_c my_gettid"
 	EVENT_NAME="gettid"
@@ -84,7 +84,7 @@ function test_user_callstack()
 
 function test_kernel_callstack()
 {
-	TRACE_PATH=$(mktemp --tmpdir -d "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
+	TRACE_PATH=$(mktemp -d -t "tmp.${FUNCNAME[0]}_trace_path.XXXXXX")
 	# Those are symbol expected to be present in the kernel callstack. This
 	# is not an exhaustive list since it's kernel dependent.
 
@@ -120,10 +120,10 @@ function test_kernel_callstack()
 	rm -rf "$TRACE_PATH"
 }
 
-# Only run userspace callstack test on x86
-uname -m | grep -E "x86" >/dev/null 2>&1
+# Only run userspace callstack test on x86 (32 and 64 variants)
+uname -m | grep "86" >/dev/null 2>&1
 if test $? == 0; then
-	NUM_TESTS=$((NUM_TESTS+11))
+	NUM_TESTS=$((NUM_TESTS+10))
 	RUN_USERSPACE_TEST=1
 else
 	RUN_USERSPACE_TEST=0
@@ -136,13 +136,7 @@ print_test_banner "$TEST_DESC"
 
 bail_out_if_no_babeltrace
 
-if [ "$(id -u)" == "0" ]; then
-	isroot=1
-else
-	isroot=0
-fi
-
-skip $isroot "Root access is needed. Skipping all tests." "$NUM_TESTS" ||
+check_skip_kernel_test "$NUM_TESTS" "Skipping all tests." ||
 {
 	validate_lttng_modules_present
 	start_lttng_sessiond