summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPetr Mladek <pmladek@suse.com>2021-06-29 09:51:58 +0200
committerPetr Mladek <pmladek@suse.com>2021-06-29 09:51:58 +0200
commitd8c032145fccfead0c3f733e7b6aaa4e81f9d326 (patch)
tree7b150b83d4341c8bc646f33a7b0cb928dab4ee8a /tools
parent80ae552917228b97ca9f7df83f74ac306d6fd68f (diff)
parentd327ea15a305024ef0085252fa3657bbb1ce25f5 (diff)
downloadlinux-d8c032145fccfead0c3f733e7b6aaa4e81f9d326.tar.gz
Merge branch 'for-5.14-vsprintf-scanf' into for-linus
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/selftests/lib/Makefile2
-rw-r--r--tools/testing/selftests/lib/config1
-rwxr-xr-xtools/testing/selftests/lib/scanf.sh4
3 files changed, 6 insertions, 1 deletions
diff --git a/tools/testing/selftests/lib/Makefile b/tools/testing/selftests/lib/Makefile
index a105f094676e..ee71fc99d5b5 100644
--- a/tools/testing/selftests/lib/Makefile
+++ b/tools/testing/selftests/lib/Makefile
@@ -4,6 +4,6 @@
# No binaries, but make sure arg-less "make" doesn't trigger "run_tests"
all:
-TEST_PROGS := printf.sh bitmap.sh prime_numbers.sh strscpy.sh
+TEST_PROGS := printf.sh bitmap.sh prime_numbers.sh scanf.sh strscpy.sh
include ../lib.mk
diff --git a/tools/testing/selftests/lib/config b/tools/testing/selftests/lib/config
index b80ee3f6e265..645839b50b0a 100644
--- a/tools/testing/selftests/lib/config
+++ b/tools/testing/selftests/lib/config
@@ -1,4 +1,5 @@
CONFIG_TEST_PRINTF=m
+CONFIG_TEST_SCANF=m
CONFIG_TEST_BITMAP=m
CONFIG_PRIME_NUMBERS=m
CONFIG_TEST_STRSCPY=m
diff --git a/tools/testing/selftests/lib/scanf.sh b/tools/testing/selftests/lib/scanf.sh
new file mode 100755
index 000000000000..b59b8ba561c3
--- /dev/null
+++ b/tools/testing/selftests/lib/scanf.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# SPDX-License-Identifier: GPL-2.0
+# Tests the scanf infrastructure using test_scanf kernel module.
+$(dirname $0)/../kselftest/module.sh "scanf" test_scanf