The patch titled
Subject: lib-test_sysctl-support-testing-of-sysctl-boot-parameter-fix
has been removed from the -mm tree. Its filename was
lib-test_sysctl-support-testing-of-sysctl-boot-parameter-fix.patch
This patch was dropped because it was folded into lib-test_sysctl-support-testing-of-sysctl-boot-parameter.patch
------------------------------------------------------
From: Vlastimil Babka <vbabka@xxxxxxx>
Subject: lib-test_sysctl-support-testing-of-sysctl-boot-parameter-fix
Skip the new test if boot_int sysctl is not present, otherwise, per Luis,
"This would fail if someone uses this script to test an older kernel, and
the scripts in selftests are supposed to work with older kernels."
Link: http://lkml.kernel.org/r/305af605-1e60-cf84-fada-6ce1ca37c102@xxxxxxx
Signed-off-by: Vlastimil Babka <vbabka@xxxxxxx>
Suggested-by: Luis Chamberlain <mcgrof@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
tools/testing/selftests/sysctl/sysctl.sh | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
--- a/tools/testing/selftests/sysctl/sysctl.sh~lib-test_sysctl-support-testing-of-sysctl-boot-parameter-fix
+++ a/tools/testing/selftests/sysctl/sysctl.sh
@@ -748,10 +748,15 @@ sysctl_test_0006()
sysctl_test_0007()
{
TARGET="${SYSCTL}/boot_int"
+ if [ ! -f $TARGET ]; then
+ echo "Skipping test for $TARGET as it is not present ..."
+ return $ksft_skip
+ fi
+
if [ -d $DIR ]; then
echo "Boot param test only possible sysctl_test is built-in, not module:"
cat $TEST_DIR/config >&2
- return 0
+ return $ksft_skip
fi
echo -n "Testing if $TARGET is set to 1 ..."
@@ -777,6 +782,7 @@ sysctl_test_0007()
echo "Skipping test, expected kernel parameter missing."
echo "To perform this test, make sure kernel is booted with parameter: sysctl.debug.test_sysctl.boot_int=1"
+ return $ksft_skip
}
list_tests()
_
Patches currently in -mm which might be from vbabka@xxxxxxx are
kernel-sysctl-support-setting-sysctl-parameters-from-kernel-command-line.patch
kernel-sysctl-support-handling-command-line-aliases.patch
kernel-hung_task-convert-hung_task_panic-boot-parameter-to-sysctl.patch
tools-testing-selftests-sysctl-sysctlsh-support-config_test_sysctl=y.patch
lib-test_sysctl-support-testing-of-sysctl-boot-parameter.patch
