From: Michael Jeanson Date: Wed, 19 Apr 2023 18:28:43 +0000 (-0400) Subject: Tests: fix: kernel/test_callstack: number of tests on i386 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=cc32d2631a514debac1accdbddc1bc5e77023c92;p=lttng-tools.git Tests: fix: kernel/test_callstack: number of tests on i386 The number of planned tests is incorrect when not running the userspace callstack tests which is limited to x86_64. Fixes the following error: ERROR: kernel/test_callstack 12 - Wait after kill session daemon # UNPLANNED # Looks like you planned 11 tests but ran 1 extra. ERROR: kernel/test_callstack - too many tests run (expected 11, got 12) ERROR: kernel/test_callstack - exited with status 1 Change-Id: Icf662968ac977b08594eca99e18476e43cc4ea79 Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- diff --git a/tests/regression/kernel/test_callstack b/tests/regression/kernel/test_callstack index ecbba3066..cd853ecde 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" @@ -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