Skip to contentSkip to conversation

selftests: Move kselftest_module.sh into kselftest/

PATCH In review Kees Cook 2 participants 2 messages Oct 30, 2019 – Nov 12, 2019 Kselftest

lore
Share & tools
lore

Kees Cook

author
#0 lore raw

PATCH 1/1 selftests: Move kselftest_module.sh into kselftest/

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.

---
 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%)
tools/testing/selftests/Makefile +1 -0
index d65f59669f7c..9ff31ec4277a 100644
@@ -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 \
tools/testing/selftests/kselftest/module.sh renamed from tools/testing/selftests/kselftest_module.sh +0 -0
similarity index 100%
rename from tools/testing/selftests/kselftest_module.sh
rename to tools/testing/selftests/kselftest/module.sh
tools/testing/selftests/lib/bitmap.sh +1 -1
index 5511dddc5c2d..00a416fbc0ef 100755
@@ -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
tools/testing/selftests/lib/prime_numbers.sh +1 -1
index 43b28f24e453..370b79a9cb2e 100755
@@ -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
tools/testing/selftests/lib/printf.sh +1 -1
index 2ffa61da0296..05f4544e87f9 100755
@@ -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
tools/testing/selftests/lib/strscpy.sh +1 -1
index 71f2be6afba6..be60ef6e1a7f 100755
@@ -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
Signature · 5 lines
2.17.1


-- 
Kees Cook
#1 lore raw

Hi Kees,

Thanks for the fix patch.

Quoted 10 lines · Kees Cook

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.

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