Merge tag 'linux_kselftest-fixes-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fix from Shuah Khan:
"Fix tracing test_multiple_writes stalls when buffer_size_kb is less
than 12KB"

* tag 'linux_kselftest-fixes-6.19-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
selftests/tracing: Fix test_multiple_writes stall

Changed files
+17 -1
tools
testing
selftests
ftrace
test.d
+17 -1
tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc
··· 89 89 # The id must be four bytes, test that 3 bytes fails a write 90 90 if echo -n abc > ./trace_marker_raw ; then 91 91 echo "Too small of write expected to fail but did not" 92 + echo ${ORIG} > buffer_size_kb 92 93 exit_fail 93 94 fi 94 95 ··· 100 99 101 100 if write_buffer 0xdeadbeef $size ; then 102 101 echo "Too big of write expected to fail but did not" 102 + echo ${ORIG} > buffer_size_kb 103 103 exit_fail 104 104 fi 105 105 } 106 106 107 + ORIG=`cat buffer_size_kb` 108 + 109 + # test_multiple_writes test needs at least 12KB buffer 110 + NEW_SIZE=12 111 + 112 + if [ ${ORIG} -lt ${NEW_SIZE} ]; then 113 + echo ${NEW_SIZE} > buffer_size_kb 114 + fi 115 + 107 116 test_buffer 108 - test_multiple_writes 117 + if ! test_multiple_writes; then 118 + echo ${ORIG} > buffer_size_kb 119 + exit_fail 120 + fi 121 + 122 + echo ${ORIG} > buffer_size_kb