[GIT,PULL] Kselftest fixes update for Linux 6.15-rc3

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.15-rc3

Commit Message

Shuah Khan April 18, 2025, 5:23 p.m. UTC

Hi Linus,

Please pull the following kselftest fixes update for Linux 6.15-rc3.

Fixes dynevent_limitations.tc test failure on dash by detecting and
handling bash and dash differences in evaluating \\.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 8ffd015db85fea3e15a77027fda6c02ced4d2444:

   Linux 6.15-rc2 (2025-04-13 11:54:49 -0700)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.15-rc3

for you to fetch changes up to 07be53cfa81afe94b14fb4bfee8243f2e0125d5e:

   selftests/ftrace: Differentiate bash and dash in dynevent_limitations.tc (2025-04-16 12:47:41 -0600)

----------------------------------------------------------------
linux_kselftest-fixes-6.15-rc3

Fixes dynevent_limitations.tc test failure on dash by detecting and
handling bash and dash differences in evaluating \\.

----------------------------------------------------------------
Steven Rostedt (1):
       selftests/ftrace: Differentiate bash and dash in dynevent_limitations.tc

  .../ftrace/test.d/dynevent/dynevent_limitations.tc | 23 +++++++++++++++++++++-
  1 file changed, 22 insertions(+), 1 deletion(-)
----------------------------------------------------------------

Comments

[e-mail] April 18, 2025, 8:27 p.m. UTC | #1

The pull request you sent on Fri, 18 Apr 2025 11:23:27 -0600:

> git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.15-rc3

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/338d40ceef38d9a36b48164e22768b40d6f89701

Thank you!

Patch

diff --git a/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc b/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc
index 6b94b678741a..f656bccb1a14 100644
--- a/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc
+++ b/tools/testing/selftests/ftrace/test.d/dynevent/dynevent_limitations.tc
@@ -7,11 +7,32 @@ 
 MAX_ARGS=128
 EXCEED_ARGS=$((MAX_ARGS + 1))
 
+# bash and dash evaluate variables differently.
+# dash will evaluate '\\' every time it is read whereas bash does not.
+#
+#   TEST_STRING="$TEST_STRING \\$i"
+#   echo $TEST_STRING
+#
+# With i=123
+# On bash, that will print "\123"
+# but on dash, that will print the escape sequence of \123 as the \ will
+# be interpreted again in the echo.
+#
+# Set a variable "bs" to save a double backslash, then echo that
+# to "ts" to see if $ts changed or not. If it changed, it's dash,
+# if not, it's bash, and then bs can equal a single backslash.
+bs='\\'
+ts=`echo $bs`
+if [ "$ts" = '\\' ]; then
+  # this is bash
+  bs='\'
+fi
+
 check_max_args() { # event_header
   TEST_STRING=$1
   # Acceptable
   for i in `seq 1 $MAX_ARGS`; do
-    TEST_STRING="$TEST_STRING \\$i"
+    TEST_STRING="$TEST_STRING $bs$i"
   done
   echo "$TEST_STRING" >> dynamic_events
   echo > dynamic_events