* [PATCH] selftests: Move kselftest_module.sh into kselftest/
@ 2019-10-30 19:45 Kees Cook
2019-11-12 7:27 ` Naresh Kamboju
0 siblings, 1 reply; 2+ messages in thread
From: Kees Cook @ 2019-10-30 19:45 UTC (permalink / raw)
To: Shuah Khan
Cc: Naresh Kamboju, Tobin C. Harding, linux-kselftest, linux-kernel
The kselftest_module.sh file was not being installed by the Makefile
"install" target, rendering the lib/*.sh tests nonfunction. This fixes
that and takes the opportunity to move it into the kselftest/ subdirectory
which is where the kselftest infrastructure bits are collecting.
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Link: https://lore.kernel.org/lkml/CA+G9fYsfJpXQvOvHdjtg8z4a89dSStOQZOKa9zMjjQgWKng1aw@mail.gmail.com
Fixes: d3460527706e ("kselftest: Add test runner creation script")
Signed-off-by: Kees Cook <keescook@chromium.org>
---
tools/testing/selftests/Makefile | 1 +
.../selftests/{kselftest_module.sh => kselftest/module.sh} | 0
tools/testing/selftests/lib/bitmap.sh | 2 +-
tools/testing/selftests/lib/prime_numbers.sh | 2 +-
tools/testing/selftests/lib/printf.sh | 2 +-
tools/testing/selftests/lib/strscpy.sh | 2 +-
6 files changed, 5 insertions(+), 4 deletions(-)
rename tools/testing/selftests/{kselftest_module.sh => kselftest/module.sh} (100%)
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile
index d65f59669f7c..9ff31ec4277a 100644
--- a/tools/testing/selftests/Makefile
+++ b/tools/testing/selftests/Makefile
@@ -193,6 +193,7 @@ install: all
ifdef INSTALL_PATH
@# Ask all targets to install their files
mkdir -p $(INSTALL_PATH)/kselftest
+ install -m 744 kselftest/module.sh $(INSTALL_PATH)/kselftest/
install -m 744 kselftest/runner.sh $(INSTALL_PATH)/kselftest/
install -m 744 kselftest/prefix.pl $(INSTALL_PATH)/kselftest/
@for TARGET in $(TARGETS); do \
diff --git a/tools/testing/selftests/kselftest_module.sh b/tools/testing/selftests/kselftest/module.sh
similarity index 100%
rename from tools/testing/selftests/kselftest_module.sh
rename to tools/testing/selftests/kselftest/module.sh
diff --git a/tools/testing/selftests/lib/bitmap.sh b/tools/testing/selftests/lib/bitmap.sh
index 5511dddc5c2d..00a416fbc0ef 100755
--- a/tools/testing/selftests/lib/bitmap.sh
+++ b/tools/testing/selftests/lib/bitmap.sh
@@ -1,3 +1,3 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
-$(dirname $0)/../kselftest_module.sh "bitmap" test_bitmap
+$(dirname $0)/../kselftest/module.sh "bitmap" test_bitmap
diff --git a/tools/testing/selftests/lib/prime_numbers.sh b/tools/testing/selftests/lib/prime_numbers.sh
index 43b28f24e453..370b79a9cb2e 100755
--- a/tools/testing/selftests/lib/prime_numbers.sh
+++ b/tools/testing/selftests/lib/prime_numbers.sh
@@ -1,4 +1,4 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Checks fast/slow prime_number generation for inconsistencies
-$(dirname $0)/../kselftest_module.sh "prime numbers" prime_numbers selftest=65536
+$(dirname $0)/../kselftest/module.sh "prime numbers" prime_numbers selftest=65536
diff --git a/tools/testing/selftests/lib/printf.sh b/tools/testing/selftests/lib/printf.sh
index 2ffa61da0296..05f4544e87f9 100755
--- a/tools/testing/selftests/lib/printf.sh
+++ b/tools/testing/selftests/lib/printf.sh
@@ -1,4 +1,4 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0
# Tests the printf infrastructure using test_printf kernel module.
-$(dirname $0)/../kselftest_module.sh "printf" test_printf
+$(dirname $0)/../kselftest/module.sh "printf" test_printf
diff --git a/tools/testing/selftests/lib/strscpy.sh b/tools/testing/selftests/lib/strscpy.sh
index 71f2be6afba6..be60ef6e1a7f 100755
--- a/tools/testing/selftests/lib/strscpy.sh
+++ b/tools/testing/selftests/lib/strscpy.sh
@@ -1,3 +1,3 @@
#!/bin/sh
# SPDX-License-Identifier: GPL-2.0+
-$(dirname $0)/../kselftest_module.sh "strscpy*" test_strscpy
+$(dirname $0)/../kselftest/module.sh "strscpy*" test_strscpy
--
2.17.1
--
Kees Cook
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] selftests: Move kselftest_module.sh into kselftest/
2019-10-30 19:45 [PATCH] selftests: Move kselftest_module.sh into kselftest/ Kees Cook
@ 2019-11-12 7:27 ` Naresh Kamboju
0 siblings, 0 replies; 2+ messages in thread
From: Naresh Kamboju @ 2019-11-12 7:27 UTC (permalink / raw)
To: Kees Cook
Cc: Shuah Khan, Tobin C. Harding,
open list:KERNEL SELFTEST FRAMEWORK, open list, lkft-triage,
Anders Roxell
Hi Kees,
Thanks for the fix patch.
On Thu, 31 Oct 2019 at 01:15, Kees Cook <keescook@chromium.org> wrote:
>
> The kselftest_module.sh file was not being installed by the Makefile
> "install" target, rendering the lib/*.sh tests nonfunction. This fixes
> that and takes the opportunity to move it into the kselftest/ subdirectory
> which is where the kselftest infrastructure bits are collecting.
>
> Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
> Link: https://lore.kernel.org/lkml/CA+G9fYsfJpXQvOvHdjtg8z4a89dSStOQZOKa9zMjjQgWKng1aw@mail.gmail.com
> Fixes: d3460527706e ("kselftest: Add test runner creation script")
> Signed-off-by: Kees Cook <keescook@chromium.org>
Now this patch merged into linux next tree.
Following tests getting pass.
kselftest:
* lib/bitmap.sh
* lib/printf.sh
* lib/strscpy.sh
Thank you.
Best regards
Naresh Kamboju
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-11-12 7:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-30 19:45 [PATCH] selftests: Move kselftest_module.sh into kselftest/ Kees Cook
2019-11-12 7:27 ` Naresh Kamboju
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).