Tests: fix: kernel/test_callstack: number of tests on i386

[lttng-tools.git] / tests / regression / kernel / test_callstack

diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack
index 9e554bbc0d538859ac1bf94d8d0174292210b733..cd853ecde3b575671a1c0405a1f2efc87e78a7d7 100755 (executable)
--- 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.
 
@@ -123,7 +123,7 @@ function test_kernel_callstack()
 # Only run userspace callstack test on x86
 uname -m | grep -E "x86" >/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