1*03514f19SPatrick WilliamsFrom 6b45c5f80d20e7bbf3d98c1fa17d2cf8716af3bb Mon Sep 17 00:00:00 2001 2*03514f19SPatrick WilliamsFrom: Xiangyu Chen <xiangyu.chen@windriver.com> 3*03514f19SPatrick WilliamsDate: Mon, 25 Mar 2024 18:20:14 +0800 4*03514f19SPatrick WilliamsSubject: [PATCH] Fix: rotation-destroy-flush: fix session daemon abort if no 5*03514f19SPatrick Williams kernel module present 6*03514f19SPatrick Williams 7*03514f19SPatrick WilliamsTesting rotation-destroy-flush when no lttng kernel modules present, it would 8*03514f19SPatrick Williamsbe failed with error message: 9*03514f19SPatrick Williams 10*03514f19SPatrick Williams Error: Unable to load required module lttng-ring-buffer-client-discard 11*03514f19SPatrick Williams not ok 1 - Start session daemon 12*03514f19SPatrick Williams Failed test 'Start session daemon' 13*03514f19SPatrick Williams not ok 2 - Create session rotation_destroy_flush in -o /tmp/tmp.test_rot ... 14*03514f19SPatrick Williams ... 15*03514f19SPatrick Williams 16*03514f19SPatrick WilliamsThis because test script that sets the LTTNG_ABORT_ON_ERROR environment 17*03514f19SPatrick Williamsvariable. It's this environment variable that causes the sessiond to handle the 18*03514f19SPatrick Williamskernel module loading failure as an abort rather than a warning. 19*03514f19SPatrick Williams 20*03514f19SPatrick WilliamsUsing "check_skip_kernel_test" to detect whether the kernel module fails to 21*03514f19SPatrick Williamsload is expected or not. If the failure is expected, the script won't set that 22*03514f19SPatrick Williamsenvironment variable any more. 23*03514f19SPatrick Williams 24*03514f19SPatrick WilliamsFixes: 3a174400 25*03514f19SPatrick Williams("tests:add check_skip_kernel_test to check root user and lttng kernel modules") 26*03514f19SPatrick Williams 27*03514f19SPatrick WilliamsUpstream-Status: Submitted [https://review.lttng.org/c/lttng-tools/+/12155] 28*03514f19SPatrick Williams 29*03514f19SPatrick WilliamsChange-Id: I371e9ba717613e2940186f710cf3cccd35baed6c 30*03514f19SPatrick WilliamsSigned-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> 31*03514f19SPatrick Williams--- 32*03514f19SPatrick Williams .../ust/rotation-destroy-flush/test_rotation_destroy_flush | 6 +++--- 33*03514f19SPatrick Williams 1 file changed, 3 insertions(+), 3 deletions(-) 34*03514f19SPatrick Williams 35*03514f19SPatrick Williamsdiff --git a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush 36*03514f19SPatrick Williamsindex 669bcbc43..64161768f 100755 37*03514f19SPatrick Williams--- a/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush 38*03514f19SPatrick Williams+++ b/tests/regression/ust/rotation-destroy-flush/test_rotation_destroy_flush 39*03514f19SPatrick Williams@@ -23,11 +23,11 @@ SIZE_LIMIT=$PAGE_SIZE 40*03514f19SPatrick Williams NR_ITER=10 41*03514f19SPatrick Williams NUM_TESTS=$((15*$NR_ITER)) 42*03514f19SPatrick Williams 43*03514f19SPatrick Williams-# Ensure the daemons invoke abort on error. 44*03514f19SPatrick Williams-export LTTNG_ABORT_ON_ERROR=1 45*03514f19SPatrick Williams- 46*03514f19SPatrick Williams source $TESTDIR/utils/utils.sh 47*03514f19SPatrick Williams 48*03514f19SPatrick Williams+# Ensure the daemons invoke abort on error. 49*03514f19SPatrick Williams+check_skip_kernel_test || export LTTNG_ABORT_ON_ERROR=1 50*03514f19SPatrick Williams+ 51*03514f19SPatrick Williams # MUST set TESTDIR before calling those functions 52*03514f19SPatrick Williams function run_app() 53*03514f19SPatrick Williams { 54*03514f19SPatrick Williams-- 55*03514f19SPatrick Williams2.25.1 56*03514f19SPatrick Williams 57