diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-01 20:41:10 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-10-01 20:41:10 -0700 |
| commit | c0f53f0d2e761e780608cf72737f93bc75539da4 (patch) | |
| tree | 14426c67dbfdfe631d663caaa3087c271368eb7f | |
| parent | 30bbcb44707a97fcb62246bebc8b413b5ab293f8 (diff) | |
| parent | 19692013415486febf71343f5cc539a343a2994b (diff) | |
Merge tag 'linux_kselftest-next-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
Pull kselftest updates from Shuah Khan:
- Fix watchdog test to exit when device doesn't support keep-alive
- Fix missing header build complaints during out of tree build
- A few minor fixes to git ignore
- MAINTAINERS file change to update dma_map_benchmark
* tag 'linux_kselftest-next-6.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
MAINTAINERS: add myself and Barry to dma_map_benchmark maintainers
selftests/kexec: Ignore selftest binary
selftests: always install UAPI headers to the correct directory
selftests/kselftest_harness: Add harness-selftest.expected to TEST_FILES
selftests: watchdog: skip ping loop if WDIOF_KEEPALIVEPING not supported
| -rw-r--r-- | MAINTAINERS | 5 | ||||
| -rw-r--r-- | tools/testing/selftests/kexec/.gitignore | 2 | ||||
| -rw-r--r-- | tools/testing/selftests/kselftest_harness/Makefile | 1 | ||||
| -rw-r--r-- | tools/testing/selftests/lib.mk | 5 | ||||
| -rw-r--r-- | tools/testing/selftests/watchdog/watchdog-test.c | 6 |
5 files changed, 16 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 6d7b697bfdba..49aace3381cd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7261,10 +7261,11 @@ F: include/linux/dmaengine.h F: include/linux/of_dma.h DMA MAPPING BENCHMARK -M: Xiang Chen <chenxiang66@hisilicon.com> +M: Barry Song <baohua@kernel.org> +M: Qinxin Xia <xiaqinxin@huawei.com> L: iommu@lists.linux.dev F: kernel/dma/map_benchmark.c -F: tools/testing/selftests/dma/ +F: tools/dma/ DMA MAPPING HELPERS M: Marek Szyprowski <m.szyprowski@samsung.com> diff --git a/tools/testing/selftests/kexec/.gitignore b/tools/testing/selftests/kexec/.gitignore new file mode 100644 index 000000000000..5f3d9e089ae8 --- /dev/null +++ b/tools/testing/selftests/kexec/.gitignore @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: GPL-2.0-only +test_kexec_jump diff --git a/tools/testing/selftests/kselftest_harness/Makefile b/tools/testing/selftests/kselftest_harness/Makefile index 0617535a6ce4..d2369c01701a 100644 --- a/tools/testing/selftests/kselftest_harness/Makefile +++ b/tools/testing/selftests/kselftest_harness/Makefile @@ -2,6 +2,7 @@ TEST_GEN_PROGS_EXTENDED := harness-selftest TEST_PROGS := harness-selftest.sh +TEST_FILES := harness-selftest.expected EXTRA_CLEAN := harness-selftest.seen include ../lib.mk diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 530390033929..a448fae57831 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk @@ -228,7 +228,10 @@ $(OUTPUT)/%:%.S $(LINK.S) $^ $(LDLIBS) -o $@ endif +# Extract the expected header directory +khdr_output := $(patsubst %/usr/include,%,$(filter %/usr/include,$(KHDR_INCLUDES))) + headers: - $(Q)$(MAKE) -C $(top_srcdir) headers + $(Q)$(MAKE) -f $(top_srcdir)/Makefile -C $(khdr_output) headers .PHONY: run_tests all clean install emit_tests gen_mods_dir clean_mods_dir headers diff --git a/tools/testing/selftests/watchdog/watchdog-test.c b/tools/testing/selftests/watchdog/watchdog-test.c index a1f506ba5578..4f09c5db0c7f 100644 --- a/tools/testing/selftests/watchdog/watchdog-test.c +++ b/tools/testing/selftests/watchdog/watchdog-test.c @@ -332,6 +332,12 @@ int main(int argc, char *argv[]) if (oneshot) goto end; + /* Check if WDIOF_KEEPALIVEPING is supported */ + if (!(info.options & WDIOF_KEEPALIVEPING)) { + printf("WDIOC_KEEPALIVE not supported by this device\n"); + goto end; + } + printf("Watchdog Ticking Away!\n"); /* |