Merge branch 'for-5.9/selftests-cleanup' into for-next

pmladek · pmladek · commit bf14b015bf51 · 2020-07-15T09:01:50.000+02:00
diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
@@ -75,7 +75,8 @@ function set_dynamic_debug() {
 }
 
 function set_ftrace_enabled() {
-	result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ')
+	result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \
+		 sysctl kernel.ftrace_enabled 2>&1)
 	echo "livepatch: $result" > /dev/kmsg
 }
 
diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh
@@ -51,7 +51,7 @@ livepatch: '$MOD_LIVEPATCH': initializing patching transition
 livepatch: '$MOD_LIVEPATCH': starting patching transition
 livepatch: '$MOD_LIVEPATCH': completing patching transition
 livepatch: '$MOD_LIVEPATCH': patching complete
-livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy kernel.ftrace_enabled = 0
+livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy
 % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled
 livepatch: '$MOD_LIVEPATCH': initializing unpatching transition
 livepatch: '$MOD_LIVEPATCH': starting unpatching transition

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,8 @@ function set_dynamic_debug() {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`function set_ftrace_enabled() {`
`78`		`- result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 \| paste --serial --delimiters=' ')`
	`78`	`+ result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \`
	`79`	`+ sysctl kernel.ftrace_enabled 2>&1)`
`79`	`80`	`echo "livepatch: $result" > /dev/kmsg`
`80`	`81`	`}`
`81`	`82`