* + selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch added to mm-nonmm-unstable branch
@ 2025-08-27 22:56 Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2025-08-27 22:56 UTC (permalink / raw)
To: mm-commits, shuah, reddybalavignesh9979, akpm
The patch titled
Subject: selftests: replace relative includes with non-relative for kselftest.h and kselftest_harness.h
has been added to the -mm mm-nonmm-unstable branch. Its filename is
selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Subject: selftests: replace relative includes with non-relative for kselftest.h and kselftest_harness.h
Date: Wed, 27 Aug 2025 20:17:33 +0530
Replace relative path of kselftest.h and kselftest_harness.h with
non-relative paths.
Link: https://lkml.kernel.org/r/20250827144733.82277-3-reddybalavignesh9979@gmail.com
Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Cc: Shuah Khan <shuah@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
tools/testing/selftests/acct/acct_syscall.c | 2 +-
tools/testing/selftests/alsa/conf.c | 2 +-
tools/testing/selftests/alsa/mixer-test.c | 2 +-
tools/testing/selftests/alsa/pcm-test.c | 2 +-
tools/testing/selftests/alsa/test-pcmtest-driver.c | 2 +-
tools/testing/selftests/alsa/utimer-test.c | 2 +-
tools/testing/selftests/arm64/abi/hwcap.c | 2 +-
tools/testing/selftests/arm64/abi/ptrace.c | 2 +-
tools/testing/selftests/arm64/abi/syscall-abi.c | 2 +-
tools/testing/selftests/arm64/fp/fp-ptrace.c | 2 +-
tools/testing/selftests/arm64/fp/fp-stress.c | 2 +-
tools/testing/selftests/arm64/fp/sve-probe-vls.c | 2 +-
tools/testing/selftests/arm64/fp/sve-ptrace.c | 2 +-
tools/testing/selftests/arm64/fp/vec-syscfg.c | 2 +-
tools/testing/selftests/arm64/fp/za-ptrace.c | 2 +-
tools/testing/selftests/arm64/fp/zt-ptrace.c | 2 +-
tools/testing/selftests/arm64/gcs/gcs-stress.c | 2 +-
tools/testing/selftests/arm64/pauth/pac.c | 2 +-
tools/testing/selftests/arm64/tags/tags_test.c | 2 +-
tools/testing/selftests/bpf/xskxceiver.c | 2 +-
tools/testing/selftests/breakpoints/breakpoint_test.c | 2 +-
tools/testing/selftests/breakpoints/breakpoint_test_arm64.c | 2 +-
tools/testing/selftests/breakpoints/step_after_suspend_test.c | 2 +-
tools/testing/selftests/cachestat/test_cachestat.c | 2 +-
tools/testing/selftests/capabilities/test_execve.c | 2 +-
tools/testing/selftests/capabilities/validate_cap.c | 2 +-
tools/testing/selftests/cgroup/test_core.c | 2 +-
tools/testing/selftests/cgroup/test_cpu.c | 2 +-
tools/testing/selftests/cgroup/test_cpuset.c | 2 +-
tools/testing/selftests/cgroup/test_freezer.c | 2 +-
tools/testing/selftests/cgroup/test_hugetlb_memcg.c | 2 +-
tools/testing/selftests/cgroup/test_kill.c | 2 +-
tools/testing/selftests/cgroup/test_kmem.c | 2 +-
tools/testing/selftests/cgroup/test_memcontrol.c | 2 +-
tools/testing/selftests/cgroup/test_pids.c | 2 +-
tools/testing/selftests/cgroup/test_zswap.c | 2 +-
tools/testing/selftests/clone3/clone3.c | 2 +-
tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c | 2 +-
tools/testing/selftests/clone3/clone3_clear_sighand.c | 2 +-
tools/testing/selftests/clone3/clone3_selftests.h | 2 +-
tools/testing/selftests/clone3/clone3_set_tid.c | 2 +-
tools/testing/selftests/connector/proc_filter.c | 2 +-
tools/testing/selftests/core/close_range_test.c | 2 +-
tools/testing/selftests/core/unshare_test.c | 2 +-
tools/testing/selftests/coredump/stackdump_test.c | 2 +-
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 2 +-
tools/testing/selftests/drivers/dma-buf/udmabuf.c | 2 +-
tools/testing/selftests/drivers/ntsync/ntsync.c | 2 +-
tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c | 2 +-
tools/testing/selftests/exec/check-exec.c | 2 +-
tools/testing/selftests/exec/execveat.c | 2 +-
tools/testing/selftests/exec/load_address.c | 2 +-
tools/testing/selftests/exec/non-regular.c | 2 +-
tools/testing/selftests/exec/null-argv.c | 2 +-
tools/testing/selftests/exec/recursion-depth.c | 2 +-
tools/testing/selftests/fchmodat2/fchmodat2_test.c | 2 +-
tools/testing/selftests/filelock/ofdlocks.c | 2 +-
tools/testing/selftests/filesystems/anon_inode_test.c | 2 +-
tools/testing/selftests/filesystems/binderfs/binderfs_test.c | 2 +-
tools/testing/selftests/filesystems/devpts_pts.c | 2 +-
tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c | 2 +-
tools/testing/selftests/filesystems/eventfd/eventfd_test.c | 2 +-
tools/testing/selftests/filesystems/file_stressor.c | 2 +-
tools/testing/selftests/filesystems/kernfs_test.c | 2 +-
tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c | 2 +-
tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c | 2 +-
tools/testing/selftests/filesystems/nsfs/iterate_mntns.c | 2 +-
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c | 2 +-
tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c | 2 +-
tools/testing/selftests/filesystems/statmount/listmount_test.c | 2 +-
tools/testing/selftests/filesystems/statmount/statmount_test.c | 2 +-
tools/testing/selftests/filesystems/statmount/statmount_test_ns.c | 2 +-
tools/testing/selftests/filesystems/utils.c | 2 +-
tools/testing/selftests/hid/hid_common.h | 2 +-
tools/testing/selftests/intel_pstate/aperf.c | 2 +-
tools/testing/selftests/iommu/iommufd_utils.h | 2 +-
tools/testing/selftests/ipc/msgque.c | 2 +-
tools/testing/selftests/ir/ir_loopback.c | 2 +-
tools/testing/selftests/kcmp/kcmp_test.c | 2 +-
tools/testing/selftests/kselftest_harness.h | 2 +-
tools/testing/selftests/kselftest_harness/harness-selftest.c | 2 +-
tools/testing/selftests/landlock/audit.h | 2 +-
tools/testing/selftests/landlock/common.h | 2 +-
tools/testing/selftests/lsm/lsm_get_self_attr_test.c | 2 +-
tools/testing/selftests/lsm/lsm_list_modules_test.c | 2 +-
tools/testing/selftests/lsm/lsm_set_self_attr_test.c | 2 +-
tools/testing/selftests/media_tests/media_device_open.c | 2 +-
tools/testing/selftests/media_tests/media_device_test.c | 2 +-
tools/testing/selftests/membarrier/membarrier_test_impl.h | 2 +-
tools/testing/selftests/mincore/mincore_selftest.c | 4 ++--
tools/testing/selftests/mm/compaction_test.c | 2 +-
tools/testing/selftests/mm/cow.c | 2 +-
tools/testing/selftests/mm/droppable.c | 2 +-
tools/testing/selftests/mm/guard-regions.c | 2 +-
tools/testing/selftests/mm/gup_longterm.c | 2 +-
tools/testing/selftests/mm/gup_test.c | 2 +-
tools/testing/selftests/mm/hmm-tests.c | 2 +-
tools/testing/selftests/mm/hugepage-mmap.c | 2 +-
tools/testing/selftests/mm/hugepage-mremap.c | 2 +-
tools/testing/selftests/mm/hugetlb-madvise.c | 2 +-
tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 2 +-
tools/testing/selftests/mm/hugetlb-soft-offline.c | 2 +-
tools/testing/selftests/mm/hugetlb_dio.c | 2 +-
tools/testing/selftests/mm/hugetlb_fault_after_madv.c | 2 +-
tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 2 +-
tools/testing/selftests/mm/ksm_functional_tests.c | 2 +-
tools/testing/selftests/mm/ksm_tests.c | 2 +-
tools/testing/selftests/mm/madv_populate.c | 2 +-
tools/testing/selftests/mm/map_fixed_noreplace.c | 2 +-
tools/testing/selftests/mm/map_hugetlb.c | 2 +-
tools/testing/selftests/mm/map_populate.c | 2 +-
tools/testing/selftests/mm/mdwe_test.c | 2 +-
tools/testing/selftests/mm/memfd_secret.c | 2 +-
tools/testing/selftests/mm/merge.c | 2 +-
tools/testing/selftests/mm/migration.c | 2 +-
tools/testing/selftests/mm/mkdirty.c | 2 +-
tools/testing/selftests/mm/mlock-random-test.c | 2 +-
tools/testing/selftests/mm/mlock2-tests.c | 2 +-
tools/testing/selftests/mm/mrelease_test.c | 2 +-
tools/testing/selftests/mm/mremap_dontunmap.c | 2 +-
tools/testing/selftests/mm/mremap_test.c | 2 +-
tools/testing/selftests/mm/mseal_test.c | 2 +-
tools/testing/selftests/mm/on-fault-limit.c | 2 +-
tools/testing/selftests/mm/pagemap_ioctl.c | 2 +-
tools/testing/selftests/mm/pfnmap.c | 2 +-
tools/testing/selftests/mm/pkey-helpers.h | 2 +-
tools/testing/selftests/mm/process_madv.c | 2 +-
tools/testing/selftests/mm/soft-dirty.c | 2 +-
tools/testing/selftests/mm/split_huge_page_test.c | 2 +-
tools/testing/selftests/mm/thuge-gen.c | 2 +-
tools/testing/selftests/mm/transhuge-stress.c | 2 +-
tools/testing/selftests/mm/uffd-common.h | 2 +-
tools/testing/selftests/mm/uffd-wp-mremap.c | 2 +-
tools/testing/selftests/mm/va_high_addr_switch.c | 2 +-
tools/testing/selftests/mm/virtual_address_range.c | 2 +-
tools/testing/selftests/mm/vm_util.c | 2 +-
tools/testing/selftests/mm/vm_util.h | 2 +-
tools/testing/selftests/mount_setattr/mount_setattr_test.c | 2 +-
tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c | 2 +-
tools/testing/selftests/mqueue/mq_open_tests.c | 2 +-
tools/testing/selftests/mqueue/mq_perf_tests.c | 2 +-
tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c | 4 ++--
tools/testing/selftests/nci/nci_dev.c | 2 +-
tools/testing/selftests/net/af_unix/diag_uid.c | 2 +-
tools/testing/selftests/net/af_unix/msg_oob.c | 2 +-
tools/testing/selftests/net/af_unix/scm_inq.c | 2 +-
tools/testing/selftests/net/af_unix/scm_pidfd.c | 2 +-
tools/testing/selftests/net/af_unix/scm_rights.c | 2 +-
tools/testing/selftests/net/af_unix/unix_connect.c | 2 +-
tools/testing/selftests/net/bind_timewait.c | 2 +-
tools/testing/selftests/net/bind_wildcard.c | 2 +-
tools/testing/selftests/net/can/test_raw_filter.c | 2 +-
tools/testing/selftests/net/cmsg_sender.c | 2 +-
tools/testing/selftests/net/epoll_busy_poll.c | 2 +-
tools/testing/selftests/net/gro.c | 2 +-
tools/testing/selftests/net/ip_local_port_range.c | 2 +-
tools/testing/selftests/net/ipsec.c | 2 +-
tools/testing/selftests/net/netfilter/conntrack_dump_flush.c | 2 +-
tools/testing/selftests/net/netlink-dumps.c | 2 +-
tools/testing/selftests/net/proc_net_pktgen.c | 2 +-
tools/testing/selftests/net/psock_fanout.c | 2 +-
tools/testing/selftests/net/psock_tpacket.c | 2 +-
tools/testing/selftests/net/reuseaddr_ports_exhausted.c | 2 +-
tools/testing/selftests/net/reuseport_bpf.c | 2 +-
tools/testing/selftests/net/reuseport_bpf_numa.c | 2 +-
tools/testing/selftests/net/rxtimestamp.c | 2 +-
tools/testing/selftests/net/sk_so_peek_off.c | 2 +-
tools/testing/selftests/net/so_incoming_cpu.c | 2 +-
tools/testing/selftests/net/socket.c | 2 +-
tools/testing/selftests/net/tap.c | 2 +-
tools/testing/selftests/net/tcp_ao/lib/setup.c | 2 +-
tools/testing/selftests/net/tcp_fastopen_backup_key.c | 2 +-
tools/testing/selftests/net/tls.c | 2 +-
tools/testing/selftests/net/toeplitz.c | 2 +-
tools/testing/selftests/net/tun.c | 2 +-
tools/testing/selftests/net/udpgso_bench_tx.c | 2 +-
tools/testing/selftests/openat2/helpers.h | 2 +-
tools/testing/selftests/openat2/openat2_test.c | 2 +-
tools/testing/selftests/openat2/rename_attack_test.c | 2 +-
tools/testing/selftests/openat2/resolve_test.c | 2 +-
tools/testing/selftests/pci_endpoint/pci_endpoint_test.c | 2 +-
tools/testing/selftests/perf_events/mmap.c | 2 +-
tools/testing/selftests/perf_events/remove_on_exec.c | 2 +-
tools/testing/selftests/perf_events/sigtrap_threads.c | 2 +-
tools/testing/selftests/perf_events/watermark_signal.c | 2 +-
tools/testing/selftests/pid_namespace/pid_max.c | 2 +-
tools/testing/selftests/pid_namespace/regression_enomem.c | 2 +-
tools/testing/selftests/pidfd/pidfd.h | 2 +-
tools/testing/selftests/pidfd/pidfd_bind_mount.c | 2 +-
tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_file_handle_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_getfd_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_info_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_open_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_setattr_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_setns_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_wait.c | 2 +-
tools/testing/selftests/pidfd/pidfd_xattr_test.c | 2 +-
tools/testing/selftests/prctl/set-anon-vma-name-test.c | 2 +-
tools/testing/selftests/prctl/set-process-name.c | 2 +-
tools/testing/selftests/proc/proc-maps-race.c | 2 +-
tools/testing/selftests/proc/proc-pid-vm.c | 2 +-
tools/testing/selftests/ptrace/get_set_sud.c | 2 +-
tools/testing/selftests/ptrace/get_syscall_info.c | 2 +-
tools/testing/selftests/ptrace/set_syscall_info.c | 2 +-
tools/testing/selftests/ptrace/vmaccess.c | 2 +-
tools/testing/selftests/resctrl/resctrl.h | 2 +-
tools/testing/selftests/ring-buffer/map_test.c | 2 +-
tools/testing/selftests/riscv/abi/pointer_masking.c | 2 +-
tools/testing/selftests/riscv/hwprobe/cbo.c | 2 +-
tools/testing/selftests/riscv/hwprobe/hwprobe.c | 2 +-
tools/testing/selftests/riscv/hwprobe/which-cpus.c | 2 +-
tools/testing/selftests/riscv/mm/mmap_bottomup.c | 2 +-
tools/testing/selftests/riscv/mm/mmap_default.c | 2 +-
tools/testing/selftests/riscv/mm/mmap_test.h | 2 +-
tools/testing/selftests/riscv/sigreturn/sigreturn.c | 2 +-
tools/testing/selftests/riscv/vector/v_initval.c | 2 +-
tools/testing/selftests/riscv/vector/vstate_prctl.c | 2 +-
tools/testing/selftests/rseq/basic_percpu_ops_test.c | 2 +-
tools/testing/selftests/rseq/rseq.c | 2 +-
tools/testing/selftests/rtc/rtctest.c | 2 +-
tools/testing/selftests/seccomp/seccomp_benchmark.c | 2 +-
tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +-
tools/testing/selftests/sgx/main.c | 2 +-
tools/testing/selftests/signal/mangle_uc_sigmask.c | 2 +-
tools/testing/selftests/signal/sas.c | 2 +-
tools/testing/selftests/sparc64/drivers/adi-test.c | 2 +-
tools/testing/selftests/sync/Makefile | 2 +-
tools/testing/selftests/sync/sync_test.c | 2 +-
tools/testing/selftests/sync/synctest.h | 2 +-
tools/testing/selftests/syscall_user_dispatch/sud_test.c | 2 +-
tools/testing/selftests/tdx/tdx_guest_test.c | 2 +-
tools/testing/selftests/timens/timens.h | 2 +-
tools/testing/selftests/timers/adjtick.c | 2 +-
tools/testing/selftests/timers/alarmtimer-suspend.c | 2 +-
tools/testing/selftests/timers/change_skew.c | 2 +-
tools/testing/selftests/timers/clocksource-switch.c | 2 +-
tools/testing/selftests/timers/freq-step.c | 2 +-
tools/testing/selftests/timers/inconsistency-check.c | 2 +-
tools/testing/selftests/timers/leap-a-day.c | 2 +-
tools/testing/selftests/timers/leapcrash.c | 2 +-
tools/testing/selftests/timers/mqueue-lat.c | 2 +-
tools/testing/selftests/timers/nanosleep.c | 2 +-
tools/testing/selftests/timers/nsleep-lat.c | 2 +-
tools/testing/selftests/timers/posix_timers.c | 2 +-
tools/testing/selftests/timers/raw_skew.c | 2 +-
tools/testing/selftests/timers/rtcpie.c | 2 +-
tools/testing/selftests/timers/set-2038.c | 2 +-
tools/testing/selftests/timers/set-tai.c | 2 +-
tools/testing/selftests/timers/set-timer-lat.c | 2 +-
tools/testing/selftests/timers/set-tz.c | 2 +-
tools/testing/selftests/timers/skew_consistency.c | 2 +-
tools/testing/selftests/timers/threadtest.c | 2 +-
tools/testing/selftests/timers/valid-adjtimex.c | 2 +-
tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 2 +-
tools/testing/selftests/tty/tty_tstamp_update.c | 2 +-
tools/testing/selftests/uevent/uevent_filtering.c | 2 +-
tools/testing/selftests/user_events/abi_test.c | 2 +-
tools/testing/selftests/user_events/dyn_test.c | 2 +-
tools/testing/selftests/user_events/ftrace_test.c | 2 +-
tools/testing/selftests/user_events/perf_test.c | 2 +-
tools/testing/selftests/user_events/user_events_selftests.h | 2 +-
tools/testing/selftests/vDSO/vdso_test_abi.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_chacha.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_clock_getres.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_correctness.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_getcpu.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_getrandom.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_gettimeofday.c | 2 +-
tools/testing/selftests/x86/corrupt_xstate_header.c | 2 +-
tools/testing/selftests/x86/helpers.h | 2 +-
tools/testing/selftests/x86/lam.c | 2 +-
tools/testing/selftests/x86/syscall_numbering.c | 2 +-
tools/testing/selftests/x86/test_mremap_vdso.c | 2 +-
tools/testing/selftests/x86/test_vsyscall.c | 2 +-
tools/testing/selftests/x86/xstate.h | 2 +-
278 files changed, 280 insertions(+), 280 deletions(-)
--- a/tools/testing/selftests/acct/acct_syscall.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/acct/acct_syscall.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/alsa/conf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/conf.c
@@ -14,7 +14,7 @@
#include <regex.h>
#include <sys/stat.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "alsa-local.h"
#define SYSFS_ROOT "/sys"
--- a/tools/testing/selftests/alsa/mixer-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/mixer-test.c
@@ -25,7 +25,7 @@
#include <poll.h>
#include <stdint.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "alsa-local.h"
#define TESTS_PER_CONTROL 7
--- a/tools/testing/selftests/alsa/pcm-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/pcm-test.c
@@ -17,7 +17,7 @@
#include <assert.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "alsa-local.h"
typedef struct timespec timestamp_t;
--- a/tools/testing/selftests/alsa/test-pcmtest-driver.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/test-pcmtest-driver.c
@@ -7,7 +7,7 @@
*/
#include <string.h>
#include <alsa/asoundlib.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define CH_NUM 4
--- a/tools/testing/selftests/alsa/utimer-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/utimer-test.c
@@ -6,7 +6,7 @@
*
* Author: Ivan Orlov <ivan.orlov0322@gmail.com>
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <sound/asound.h>
#include <unistd.h>
#include <fcntl.h>
--- a/tools/testing/selftests/arm64/abi/hwcap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/abi/hwcap.c
@@ -17,7 +17,7 @@
#include <asm/sigcontext.h>
#include <asm/unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define TESTS_PER_HWCAP 3
--- a/tools/testing/selftests/arm64/abi/ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/abi/ptrace.c
@@ -18,7 +18,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define EXPECTED_TESTS 11
--- a/tools/testing/selftests/arm64/abi/syscall-abi.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/abi/syscall-abi.c
@@ -16,7 +16,7 @@
#include <asm/sigcontext.h>
#include <asm/unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "syscall-abi.h"
--- a/tools/testing/selftests/arm64/fp/fp-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/fp-ptrace.c
@@ -27,7 +27,7 @@
#include <asm/sve_context.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "fp-ptrace.h"
--- a/tools/testing/selftests/arm64/fp/fp-stress.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/fp-stress.c
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <asm/hwcap.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define MAX_VLS 16
--- a/tools/testing/selftests/arm64/fp/sve-probe-vls.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/sve-probe-vls.c
@@ -12,7 +12,7 @@
#include <sys/prctl.h>
#include <asm/sigcontext.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "rdvl.h"
int main(int argc, char **argv)
--- a/tools/testing/selftests/arm64/fp/sve-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/sve-ptrace.c
@@ -19,7 +19,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
/* <linux/elf.h> and <sys/auxv.h> don't like each other, so: */
#ifndef NT_ARM_SVE
--- a/tools/testing/selftests/arm64/fp/vec-syscfg.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/vec-syscfg.c
@@ -19,7 +19,7 @@
#include <asm/sigcontext.h>
#include <asm/hwcap.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "rdvl.h"
#define ARCH_MIN_VL SVE_VL_MIN
--- a/tools/testing/selftests/arm64/fp/za-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/za-ptrace.c
@@ -18,7 +18,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
/* <linux/elf.h> and <sys/auxv.h> don't like each other, so: */
#ifndef NT_ARM_ZA
--- a/tools/testing/selftests/arm64/fp/zt-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/zt-ptrace.c
@@ -18,7 +18,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
/* <linux/elf.h> and <sys/auxv.h> don't like each other, so: */
#ifndef NT_ARM_ZA
--- a/tools/testing/selftests/arm64/gcs/gcs-stress.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/gcs/gcs-stress.c
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <asm/hwcap.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
struct child_data {
char *name, *output;
--- a/tools/testing/selftests/arm64/pauth/pac.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/pauth/pac.c
@@ -10,7 +10,7 @@
#include <setjmp.h>
#include <sched.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "helper.h"
#define PAC_COLLISION_ATTEMPTS 1000
--- a/tools/testing/selftests/arm64/tags/tags_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/tags/tags_test.c
@@ -6,7 +6,7 @@
#include <stdint.h>
#include <sys/prctl.h>
#include <sys/utsname.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define SHIFT_TAG(tag) ((uint64_t)(tag) << 56)
#define SET_TAG(ptr, tag) (((uint64_t)(ptr) & ~SHIFT_TAG(0xff)) | \
--- a/tools/testing/selftests/bpf/xskxceiver.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/bpf/xskxceiver.c
@@ -104,7 +104,7 @@
#include "xskxceiver.h"
#include <bpf/bpf.h>
#include <linux/filter.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "xsk_xdp_common.h"
#include <network_helpers.h>
--- a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c
@@ -26,7 +26,7 @@
#include <errno.h>
#include <signal.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static volatile uint8_t var[96] __attribute__((__aligned__(32)));
--- a/tools/testing/selftests/breakpoints/breakpoint_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/breakpoints/breakpoint_test.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define COUNT_ISN_BPS 4
#define COUNT_WPS 4
--- a/tools/testing/selftests/breakpoints/step_after_suspend_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/breakpoints/step_after_suspend_test.c
@@ -19,7 +19,7 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
void child(int cpu)
{
--- a/tools/testing/selftests/cachestat/test_cachestat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cachestat/test_cachestat.c
@@ -16,7 +16,7 @@
#include <fcntl.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define NR_TESTS 9
--- a/tools/testing/selftests/capabilities/test_execve.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/capabilities/test_execve.c
@@ -18,7 +18,7 @@
#include <sys/prctl.h>
#include <sys/stat.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static int nerrs;
static pid_t mpid; /* main() pid is used to avoid duplicate test counts */
--- a/tools/testing/selftests/capabilities/validate_cap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/capabilities/validate_cap.c
@@ -7,7 +7,7 @@
#include <sys/prctl.h>
#include <sys/auxv.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19)
# define HAVE_GETAUXVAL
--- a/tools/testing/selftests/cgroup/test_core.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_core.c
@@ -17,7 +17,7 @@
#include <string.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static bool nsdelegate;
--- a/tools/testing/selftests/cgroup/test_cpu.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_cpu.c
@@ -11,7 +11,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
enum hog_clock_type {
--- a/tools/testing/selftests/cgroup/test_cpuset.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_cpuset.c
@@ -3,7 +3,7 @@
#include <linux/limits.h>
#include <signal.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static int idle_process_fn(const char *cgroup, void *arg)
--- a/tools/testing/selftests/cgroup/test_freezer.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_freezer.c
@@ -11,7 +11,7 @@
#include <string.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
#define DEBUG
--- a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
#define ADDR ((void *)(0x0UL))
--- a/tools/testing/selftests/cgroup/test_kill.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_kill.c
@@ -9,7 +9,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "../pidfd/pidfd.h"
#include "cgroup_util.h"
--- a/tools/testing/selftests/cgroup/test_kmem.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_kmem.c
@@ -14,7 +14,7 @@
#include <sys/sysinfo.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
--- a/tools/testing/selftests/cgroup/test_memcontrol.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static bool has_localevents;
--- a/tools/testing/selftests/cgroup/test_pids.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_pids.c
@@ -9,7 +9,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static int run_success(const char *cgroup, void *arg)
--- a/tools/testing/selftests/cgroup/test_zswap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_zswap.c
@@ -10,7 +10,7 @@
#include <sys/wait.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static int read_int(const char *path, size_t *value)
--- a/tools/testing/selftests/clone3/clone3.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3.c
@@ -18,7 +18,7 @@
#include <unistd.h>
#include <sched.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "clone3_selftests.h"
enum test_mode {
--- a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <sched.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "clone3_selftests.h"
static void child_exit(int ret)
--- a/tools/testing/selftests/clone3/clone3_clear_sighand.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_clear_sighand.c
@@ -13,7 +13,7 @@
#include <sys/syscall.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "clone3_selftests.h"
static void nop_handler(int signo)
--- a/tools/testing/selftests/clone3/clone3_selftests.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_selftests.h
@@ -11,7 +11,7 @@
#include <syscall.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
--- a/tools/testing/selftests/clone3/clone3_set_tid.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_set_tid.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include <sched.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "clone3_selftests.h"
#define MAX_PID_NS_LEVEL 32
--- a/tools/testing/selftests/connector/proc_filter.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/connector/proc_filter.c
@@ -16,7 +16,7 @@
#include <signal.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define NL_MESSAGE_SIZE (sizeof(struct nlmsghdr) + sizeof(struct cn_msg) + \
sizeof(struct proc_input))
--- a/tools/testing/selftests/core/close_range_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/core/close_range_test.c
@@ -14,7 +14,7 @@
#include <sys/resource.h>
#include <linux/close_range.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../clone3/clone3_selftests.h"
--- a/tools/testing/selftests/coredump/stackdump_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/coredump/stackdump_test.c
@@ -19,7 +19,7 @@
#include <sys/un.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../filesystems/wrappers.h"
#include "../pidfd/pidfd.h"
--- a/tools/testing/selftests/core/unshare_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/core/unshare_test.c
@@ -14,7 +14,7 @@
#include <sys/resource.h>
#include <linux/close_range.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../clone3/clone3_selftests.h"
TEST(unshare_EMFILE)
--- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
@@ -15,7 +15,7 @@
#include <linux/dma-buf.h>
#include <linux/dma-heap.h>
#include <drm/drm.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define DEVPATH "/dev/dma_heap"
--- a/tools/testing/selftests/drivers/dma-buf/udmabuf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/drivers/dma-buf/udmabuf.c
@@ -16,7 +16,7 @@
#include <sys/mman.h>
#include <linux/memfd.h>
#include <linux/udmabuf.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define TEST_PREFIX "drivers/dma-buf/udmabuf"
#define NUM_PAGES 4
--- a/tools/testing/selftests/drivers/ntsync/ntsync.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/drivers/ntsync/ntsync.c
@@ -12,7 +12,7 @@
#include <time.h>
#include <pthread.h>
#include <linux/ntsync.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
static int read_sem_state(int sem, __u32 *count, __u32 *max)
{
--- a/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c
@@ -14,7 +14,7 @@
#include <asm/uvdevice.h>
-#include "../../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define UV_PATH "/dev/uv"
#define BUFFER_SIZE 0x200
--- a/tools/testing/selftests/exec/check-exec.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/check-exec.c
@@ -30,7 +30,7 @@
#define _ASM_GENERIC_FCNTL_H
#include <linux/fcntl.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static int sys_execveat(int dirfd, const char *pathname, char *const argv[],
char *const envp[], int flags)
--- a/tools/testing/selftests/exec/execveat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/execveat.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TESTS_EXPECTED 54
#define TEST_NAME_LEN (PATH_MAX * 4)
--- a/tools/testing/selftests/exec/load_address.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/load_address.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct Statistics {
unsigned long long load_address;
--- a/tools/testing/selftests/exec/non-regular.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/non-regular.c
@@ -9,7 +9,7 @@
#include <sys/sysmacros.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
/* Remove a file, ignoring the result if it didn't exist. */
void rm(struct __test_metadata *_metadata, const char *pathname,
--- a/tools/testing/selftests/exec/null-argv.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/null-argv.c
@@ -5,7 +5,7 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define FORK(exec) \
do { \
--- a/tools/testing/selftests/exec/recursion-depth.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/recursion-depth.c
@@ -23,7 +23,7 @@
#include <fcntl.h>
#include <sys/mount.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/fchmodat2/fchmodat2_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/fchmodat2/fchmodat2_test.c
@@ -7,7 +7,7 @@
#include <syscall.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int sys_fchmodat2(int dfd, const char *filename, mode_t mode, int flags)
{
--- a/tools/testing/selftests/filelock/ofdlocks.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filelock/ofdlocks.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static int lock_set(int fd, struct flock *fl)
{
--- a/tools/testing/selftests/filesystems/anon_inode_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/anon_inode_test.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <sys/stat.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "wrappers.h"
TEST(anon_inode_no_chown)
--- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c
@@ -21,7 +21,7 @@
#include <linux/android/binder.h>
#include <linux/android/binderfs.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define DEFAULT_THREADS 4
--- a/tools/testing/selftests/filesystems/devpts_pts.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/devpts_pts.c
@@ -11,7 +11,7 @@
#include <asm/ioctls.h>
#include <sys/mount.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static bool terminal_dup2(int duplicate, int original)
{
--- a/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c
@@ -11,7 +11,7 @@
#include <sys/epoll.h>
#include <sys/socket.h>
#include <sys/eventfd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
struct epoll_mtcontext
{
--- a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c
@@ -11,7 +11,7 @@
#include <pthread.h>
#include <sys/epoll.h>
#include <sys/eventfd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define EVENTFD_TEST_ITERATIONS 100000UL
--- a/tools/testing/selftests/filesystems/file_stressor.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/file_stressor.c
@@ -12,7 +12,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <linux/types.h>
#include <linux/mount.h>
--- a/tools/testing/selftests/filesystems/kernfs_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/kernfs_test.c
@@ -7,7 +7,7 @@
#include <sys/stat.h>
#include <sys/xattr.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "wrappers.h"
TEST(kernfs_listxattr)
--- a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../statmount/statmount.h"
#include "../utils.h"
--- a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../../pidfd/pidfd.h"
#include "../statmount/statmount.h"
#include "../utils.h"
--- a/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c
@@ -12,7 +12,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define MNT_NS_COUNT 11
#define MNT_NS_LAST_INDEX 10
--- a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c
@@ -15,7 +15,7 @@
#include <sched.h>
#include <fcntl.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "log.h"
#include "../wrappers.h"
--- a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c
@@ -12,7 +12,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../../pidfd/pidfd.h"
#include "log.h"
#include "../utils.h"
--- a/tools/testing/selftests/filesystems/statmount/listmount_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/statmount/listmount_test.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#include "statmount.h"
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef LISTMOUNT_REVERSE
#define LISTMOUNT_REVERSE (1 << 0) /* List later mounts first */
--- a/tools/testing/selftests/filesystems/statmount/statmount_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/statmount/statmount_test.c
@@ -13,7 +13,7 @@
#include <linux/stat.h>
#include "statmount.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
static const char *const known_fs[] = {
"9p", "adfs", "affs", "afs", "aio", "anon_inodefs", "apparmorfs",
--- a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c
@@ -15,7 +15,7 @@
#include "statmount.h"
#include "../utils.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
#define NSID_PASS 0
#define NSID_FAIL 1
--- a/tools/testing/selftests/filesystems/utils.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/utils.c
@@ -20,7 +20,7 @@
#include <sys/xattr.h>
#include <sys/mount.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "wrappers.h"
#include "utils.h"
--- a/tools/testing/selftests/hid/hid_common.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/hid/hid_common.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (c) 2022-2024 Red Hat */
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <fcntl.h>
#include <fnmatch.h>
--- a/tools/testing/selftests/intel_pstate/aperf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/intel_pstate/aperf.c
@@ -11,7 +11,7 @@
#include <errno.h>
#include <string.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MSEC_PER_SEC 1000L
#define NSEC_PER_MSEC 1000000L
--- a/tools/testing/selftests/iommu/iommufd_utils.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/iommu/iommufd_utils.h
@@ -11,7 +11,7 @@
#include <assert.h>
#include <poll.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../../../../drivers/iommu/iommufd/iommufd_test.h"
/* Hack to make assertions more readable */
--- a/tools/testing/selftests/ipc/msgque.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ipc/msgque.c
@@ -7,7 +7,7 @@
#include <sys/msg.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MAX_MSG_SIZE 32
--- a/tools/testing/selftests/ir/ir_loopback.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ir/ir_loopback.c
@@ -23,7 +23,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TEST_SCANCODES 10
#define SYSFS_PATH_MAX 256
--- a/tools/testing/selftests/kcmp/kcmp_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/kcmp/kcmp_test.c
@@ -18,7 +18,7 @@
#include <sys/wait.h>
#include <sys/epoll.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static long sys_kcmp(int pid1, int pid2, int type, unsigned long fd1, unsigned long fd2)
{
--- a/tools/testing/selftests/kselftest_harness.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/kselftest_harness.h
@@ -14,7 +14,7 @@
*
* .. code-block:: c
*
- * #include "../kselftest_harness.h"
+ * #include "kselftest_harness.h"
*
* TEST(standalone_test) {
* do_some_stuff;
--- a/tools/testing/selftests/kselftest_harness/harness-selftest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/kselftest_harness/harness-selftest.c
@@ -8,7 +8,7 @@
/* Avoid any inconsistencies */
#define TH_LOG_STREAM stdout
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static void test_helper(struct __test_metadata *_metadata)
{
--- a/tools/testing/selftests/landlock/audit.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/landlock/audit.h
@@ -20,7 +20,7 @@
#include <sys/time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef ARRAY_SIZE
#define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
--- a/tools/testing/selftests/landlock/common.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/landlock/common.h
@@ -17,7 +17,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "wrappers.h"
#define TMP_DIR "tmp"
--- a/tools/testing/selftests/lsm/lsm_get_self_attr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/lsm/lsm_get_self_attr_test.c
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "common.h"
static struct lsm_ctx *next_ctx(struct lsm_ctx *ctxp)
--- a/tools/testing/selftests/lsm/lsm_list_modules_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/lsm/lsm_list_modules_test.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "common.h"
TEST(size_null_lsm_list_modules)
--- a/tools/testing/selftests/lsm/lsm_set_self_attr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/lsm/lsm_set_self_attr_test.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "common.h"
TEST(ctx_null_lsm_set_self_attr)
--- a/tools/testing/selftests/media_tests/media_device_open.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/media_tests/media_device_open.c
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <linux/media.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/media_tests/media_device_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/media_tests/media_device_test.c
@@ -39,7 +39,7 @@
#include <time.h>
#include <linux/media.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/membarrier/membarrier_test_impl.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/membarrier/membarrier_test_impl.h
@@ -7,7 +7,7 @@
#include <string.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static int registrations;
--- a/tools/testing/selftests/mincore/mincore_selftest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mincore/mincore_selftest.c
@@ -15,8 +15,8 @@
#include <string.h>
#include <fcntl.h>
-#include "../kselftest.h"
-#include "../kselftest_harness.h"
+#include "kselftest.h"
+#include "kselftest_harness.h"
/* Default test file size: 4MB */
#define MB (1UL << 20)
--- a/tools/testing/selftests/mm/compaction_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/compaction_test.c
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MAP_SIZE_MB 100
#define MAP_SIZE (MAP_SIZE_MB * 1024 * 1024)
--- a/tools/testing/selftests/mm/cow.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/cow.c
@@ -27,7 +27,7 @@
#endif /* LOCAL_CONFIG_HAVE_LIBURING */
#include "../../../../mm/gup_test.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#include "thp_settings.h"
--- a/tools/testing/selftests/mm/droppable.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/droppable.c
@@ -13,7 +13,7 @@
#include <sys/mman.h>
#include <linux/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/mm/guard-regions.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/guard-regions.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <asm-generic/mman.h> /* Force the import of the tools version. */
#include <assert.h>
#include <errno.h>
--- a/tools/testing/selftests/mm/gup_longterm.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/gup_longterm.c
@@ -27,7 +27,7 @@
#endif /* LOCAL_CONFIG_HAVE_LIBURING */
#include "../../../../mm/gup_test.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
static size_t pagesize;
--- a/tools/testing/selftests/mm/gup_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/gup_test.c
@@ -12,7 +12,7 @@
#include <pthread.h>
#include <assert.h>
#include <mm/gup_test.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define MB (1UL << 20)
--- a/tools/testing/selftests/mm/hmm-tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hmm-tests.c
@@ -10,7 +10,7 @@
* bugs.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <errno.h>
#include <fcntl.h>
--- a/tools/testing/selftests/mm/hugepage-mmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugepage-mmap.c
@@ -15,7 +15,7 @@
#include <unistd.h>
#include <sys/mman.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define LENGTH (256UL*1024*1024)
#define PROTECTION (PROT_READ | PROT_WRITE)
--- a/tools/testing/selftests/mm/hugepage-mremap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugepage-mremap.c
@@ -24,7 +24,7 @@
#include <sys/ioctl.h>
#include <string.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define DEFAULT_LENGTH_MB 10UL
--- a/tools/testing/selftests/mm/hugetlb_dio.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb_dio.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <sys/mman.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
void run_dio_using_hugetlb(unsigned int start_off, unsigned int end_off)
{
--- a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c
@@ -9,7 +9,7 @@
#include <signal.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define INLOOP_ITER 100
--- a/tools/testing/selftests/mm/hugetlb-madvise.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb-madvise.c
@@ -19,7 +19,7 @@
#include <sys/mman.h>
#include <fcntl.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define MIN_FREE_PAGES 20
#define NR_HUGE_PAGES 10 /* common number of pages to map/allocate */
--- a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define INLOOP_ITER 100
--- a/tools/testing/selftests/mm/hugetlb-read-hwpoison.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb-read-hwpoison.c
@@ -11,7 +11,7 @@
#include <errno.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define PREFIX " ... "
#define ERROR_PREFIX " !!! "
--- a/tools/testing/selftests/mm/hugetlb-soft-offline.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb-soft-offline.c
@@ -24,7 +24,7 @@
#include <sys/statfs.h>
#include <sys/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef MADV_SOFT_OFFLINE
#define MADV_SOFT_OFFLINE 101
--- a/tools/testing/selftests/mm/ksm_functional_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/ksm_functional_tests.c
@@ -21,7 +21,7 @@
#include <sys/wait.h>
#include <linux/userfaultfd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define KiB 1024u
--- a/tools/testing/selftests/mm/ksm_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/ksm_tests.c
@@ -12,7 +12,7 @@
#include <stdint.h>
#include <err.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include <include/vdso/time64.h>
#include "vm_util.h"
#include "thp_settings.h"
--- a/tools/testing/selftests/mm/madv_populate.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/madv_populate.c
@@ -17,7 +17,7 @@
#include <linux/mman.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
/*
--- a/tools/testing/selftests/mm/map_fixed_noreplace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/map_fixed_noreplace.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static void dump_maps(void)
{
--- a/tools/testing/selftests/mm/map_hugetlb.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/map_hugetlb.c
@@ -11,7 +11,7 @@
#include <sys/mman.h>
#include <fcntl.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define LENGTH (256UL*1024*1024)
#define PROTECTION (PROT_READ | PROT_WRITE)
--- a/tools/testing/selftests/mm/map_populate.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/map_populate.c
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
--- a/tools/testing/selftests/mm/mdwe_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mdwe_test.c
@@ -14,7 +14,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef __aarch64__
# define PROT_BTI 0
--- a/tools/testing/selftests/mm/memfd_secret.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/memfd_secret.c
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define fail(fmt, ...) ksft_test_result_fail(fmt, ##__VA_ARGS__)
#define pass(fmt, ...) ksft_test_result_pass(fmt, ##__VA_ARGS__)
--- a/tools/testing/selftests/mm/merge.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/merge.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <linux/prctl.h>
#include <fcntl.h>
#include <stdio.h>
--- a/tools/testing/selftests/mm/migration.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/migration.c
@@ -4,7 +4,7 @@
* paths in the kernel.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "thp_settings.h"
#include <strings.h>
--- a/tools/testing/selftests/mm/mkdirty.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mkdirty.c
@@ -22,7 +22,7 @@
#include <linux/userfaultfd.h>
#include <linux/mempolicy.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
static size_t pagesize;
--- a/tools/testing/selftests/mm/mlock2-tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mlock2-tests.c
@@ -7,7 +7,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "mlock2.h"
struct vm_boundaries {
--- a/tools/testing/selftests/mm/mlock-random-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mlock-random-test.c
@@ -13,7 +13,7 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "mlock2.h"
#define CHUNK_UNIT (128 * 1024)
--- a/tools/testing/selftests/mm/mrelease_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mrelease_test.c
@@ -12,7 +12,7 @@
#include <unistd.h>
#include <asm-generic/unistd.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define MB(x) (x << 20)
#define MAX_SIZE_MB 1024
--- a/tools/testing/selftests/mm/mremap_dontunmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mremap_dontunmap.c
@@ -14,7 +14,7 @@
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
unsigned long page_size;
char *page_buffer;
--- a/tools/testing/selftests/mm/mremap_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mremap_test.c
@@ -16,7 +16,7 @@
#include <time.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define EXPECT_SUCCESS 0
#define EXPECT_FAILURE 1
--- a/tools/testing/selftests/mm/mseal_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mseal_test.c
@@ -8,7 +8,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include <syscall.h>
#include <errno.h>
#include <stdio.h>
--- a/tools/testing/selftests/mm/on-fault-limit.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/on-fault-limit.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <sys/time.h>
#include <sys/resource.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static void test_limit(void)
{
--- a/tools/testing/selftests/mm/pagemap_ioctl.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/pagemap_ioctl.c
@@ -8,7 +8,7 @@
#include <errno.h>
#include <malloc.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#include <linux/types.h>
#include <linux/memfd.h>
#include <linux/userfaultfd.h>
--- a/tools/testing/selftests/mm/pfnmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/pfnmap.c
@@ -22,7 +22,7 @@
#include <sys/mman.h>
#include <sys/wait.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "vm_util.h"
static sigjmp_buf sigjmp_buf_env;
--- a/tools/testing/selftests/mm/pkey-helpers.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/pkey-helpers.h
@@ -16,7 +16,7 @@
#include <linux/mman.h>
#include <linux/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* Define some kernel-like types */
typedef __u8 u8;
--- a/tools/testing/selftests/mm/process_madv.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/process_madv.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
--- a/tools/testing/selftests/mm/soft-dirty.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/soft-dirty.c
@@ -7,7 +7,7 @@
#include <malloc.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#include "thp_settings.h"
--- a/tools/testing/selftests/mm/split_huge_page_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/split_huge_page_test.c
@@ -20,7 +20,7 @@
#include <stdbool.h>
#include <time.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
uint64_t pagesize;
unsigned int pageshift;
--- a/tools/testing/selftests/mm/thuge-gen.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/thuge-gen.c
@@ -27,7 +27,7 @@
#include <stdarg.h>
#include <string.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#if !defined(MAP_HUGETLB)
#define MAP_HUGETLB 0x40000
--- a/tools/testing/selftests/mm/transhuge-stress.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/transhuge-stress.c
@@ -16,7 +16,7 @@
#include <string.h>
#include <sys/mman.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
int backing_fd = -1;
int mmap_flags = MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE;
--- a/tools/testing/selftests/mm/uffd-common.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/uffd-common.h
@@ -35,7 +35,7 @@
#include <sys/random.h>
#include <stdatomic.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define UFFD_FLAGS (O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY)
--- a/tools/testing/selftests/mm/uffd-wp-mremap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/uffd-wp-mremap.c
@@ -7,7 +7,7 @@
#include <assert.h>
#include <linux/mman.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "thp_settings.h"
#include "uffd-common.h"
--- a/tools/testing/selftests/mm/va_high_addr_switch.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/va_high_addr_switch.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
/*
* The hint addr value is used to allocate addresses
--- a/tools/testing/selftests/mm/virtual_address_range.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/virtual_address_range.c
@@ -16,7 +16,7 @@
#include <fcntl.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
/*
* Maximum address range mapped with a single mmap()
--- a/tools/testing/selftests/mm/vm_util.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/vm_util.c
@@ -9,7 +9,7 @@
#include <linux/fs.h>
#include <sys/syscall.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define PMD_SIZE_FILE_PATH "/sys/kernel/mm/transparent_hugepage/hpage_pmd_size"
--- a/tools/testing/selftests/mm/vm_util.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/vm_util.h
@@ -6,7 +6,7 @@
#include <stdarg.h>
#include <strings.h> /* ffsl() */
#include <unistd.h> /* _SC_PAGESIZE */
-#include "../kselftest.h"
+#include "kselftest.h"
#include <linux/fs.h>
#define BIT_ULL(nr) (1ULL << (nr))
--- a/tools/testing/selftests/mount_setattr/mount_setattr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mount_setattr/mount_setattr_test.c
@@ -21,7 +21,7 @@
#include <linux/mount.h>
#include "../filesystems/wrappers.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef CLONE_NEWNS
#define CLONE_NEWNS 0x00020000
--- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
@@ -15,7 +15,7 @@
#include <stdarg.h>
#include <sys/syscall.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef CLONE_NEWNS
#define CLONE_NEWNS 0x00020000
--- a/tools/testing/selftests/mqueue/mq_open_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mqueue/mq_open_tests.c
@@ -33,7 +33,7 @@
#include <mqueue.h>
#include <error.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static char *usage =
"Usage:\n"
--- a/tools/testing/selftests/mqueue/mq_perf_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mqueue/mq_perf_tests.c
@@ -40,7 +40,7 @@
#include <popt.h>
#include <error.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static char *usage =
"Usage:\n"
--- a/tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c
@@ -11,8 +11,8 @@
#include <string.h>
#include <stdbool.h>
-#include "../kselftest.h"
-#include "../kselftest_harness.h"
+#include "kselftest.h"
+#include "kselftest_harness.h"
#define VMFLAGS "VmFlags:"
#define MSEAL_FLAGS "sl"
--- a/tools/testing/selftests/nci/nci_dev.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/nci/nci_dev.c
@@ -16,7 +16,7 @@
#include <sys/socket.h>
#include <linux/nfc.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define GENLMSG_DATA(glh) ((void *)(NLMSG_DATA(glh) + GENL_HDRLEN))
#define GENLMSG_PAYLOAD(glh) (NLMSG_PAYLOAD(glh, 0) - GENL_HDRLEN)
--- a/tools/testing/selftests/net/af_unix/diag_uid.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/diag_uid.c
@@ -14,7 +14,7 @@
#include <sys/types.h>
#include <sys/un.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(diag_uid)
{
--- a/tools/testing/selftests/net/af_unix/msg_oob.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/msg_oob.c
@@ -11,7 +11,7 @@
#include <sys/signalfd.h>
#include <sys/socket.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define BUF_SZ 32
--- a/tools/testing/selftests/net/af_unix/scm_inq.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/scm_inq.c
@@ -6,7 +6,7 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define NR_CHUNKS 100
#define MSG_LEN 256
--- a/tools/testing/selftests/net/af_unix/scm_pidfd.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/scm_pidfd.c
@@ -16,7 +16,7 @@
#include <sys/wait.h>
#include "../../pidfd/pidfd.h"
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define clean_errno() (errno == 0 ? "None" : strerror(errno))
#define log_err(MSG, ...) \
--- a/tools/testing/selftests/net/af_unix/scm_rights.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/scm_rights.c
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(scm_rights)
{
--- a/tools/testing/selftests/net/af_unix/unix_connect.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/unix_connect.c
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(unix_connect)
{
--- a/tools/testing/selftests/net/bind_timewait.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/bind_timewait.c
@@ -4,7 +4,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(bind_timewait)
{
--- a/tools/testing/selftests/net/bind_wildcard.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/bind_wildcard.c
@@ -4,7 +4,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const __u32 in4addr_any = INADDR_ANY;
static const __u32 in4addr_loopback = INADDR_LOOPBACK;
--- a/tools/testing/selftests/net/can/test_raw_filter.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/can/test_raw_filter.c
@@ -19,7 +19,7 @@
#include <linux/can.h>
#include <linux/can/raw.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define ID 0x123
--- a/tools/testing/selftests/net/cmsg_sender.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/cmsg_sender.c
@@ -16,7 +16,7 @@
#include <linux/udp.h>
#include <sys/socket.h>
-#include "../kselftest.h"
+#include "kselftest.h"
enum {
ERN_SUCCESS = 0,
--- a/tools/testing/selftests/net/epoll_busy_poll.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/epoll_busy_poll.c
@@ -23,7 +23,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
/* if the headers haven't been updated, we need to define some things */
#if !defined(EPOLL_IOC_TYPE)
--- a/tools/testing/selftests/net/gro.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/gro.c
@@ -57,7 +57,7 @@
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define DPORT 8000
#define SPORT 1500
--- a/tools/testing/selftests/net/ip_local_port_range.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/ip_local_port_range.c
@@ -10,7 +10,7 @@
#include <fcntl.h>
#include <netinet/ip.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef IP_LOCAL_PORT_RANGE
#define IP_LOCAL_PORT_RANGE 51
--- a/tools/testing/selftests/net/ipsec.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/ipsec.c
@@ -34,7 +34,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define printk(fmt, ...) \
ksft_print_msg("%d[%u] " fmt "\n", getpid(), __LINE__, ##__VA_ARGS__)
--- a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
@@ -10,7 +10,7 @@
#include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h>
#include <linux/netfilter/nf_conntrack_tcp.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TEST_ZONE_ID 123
#define NF_CT_DEFAULT_ZONE_ID 0
--- a/tools/testing/selftests/net/netlink-dumps.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/netlink-dumps.c
@@ -18,7 +18,7 @@
#include <linux/mqueue.h>
#include <linux/rtnetlink.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <ynl.h>
--- a/tools/testing/selftests/net/proc_net_pktgen.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/proc_net_pktgen.c
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const char ctrl_cmd_stop[] = "stop";
static const char ctrl_cmd_start[] = "start";
--- a/tools/testing/selftests/net/psock_fanout.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/psock_fanout.c
@@ -54,7 +54,7 @@
#include <unistd.h>
#include "psock_lib.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define RING_NUM_FRAMES 20
--- a/tools/testing/selftests/net/psock_tpacket.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/psock_tpacket.c
@@ -46,7 +46,7 @@
#include "psock_lib.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef bug_on
# define bug_on(cond) assert(!(cond))
--- a/tools/testing/selftests/net/reuseaddr_ports_exhausted.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/reuseaddr_ports_exhausted.c
@@ -22,7 +22,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
struct reuse_opts {
int reuseaddr[2];
--- a/tools/testing/selftests/net/reuseport_bpf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/reuseport_bpf.c
@@ -24,7 +24,7 @@
#include <sys/resource.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct test_params {
int recv_family;
--- a/tools/testing/selftests/net/reuseport_bpf_numa.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/reuseport_bpf_numa.c
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <numa.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static const int PORT = 8888;
--- a/tools/testing/selftests/net/rxtimestamp.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/rxtimestamp.c
@@ -18,7 +18,7 @@
#include <linux/net_tstamp.h>
#include <linux/errqueue.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct options {
int so_timestamp;
--- a/tools/testing/selftests/net/sk_so_peek_off.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/sk_so_peek_off.c
@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static char *afstr(int af, int proto)
{
--- a/tools/testing/selftests/net/socket.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/socket.c
@@ -7,7 +7,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct socket_testcase {
int domain;
--- a/tools/testing/selftests/net/so_incoming_cpu.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/so_incoming_cpu.c
@@ -9,7 +9,7 @@
#include <sys/socket.h>
#include <sys/sysinfo.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(so_incoming_cpu)
{
--- a/tools/testing/selftests/net/tap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tap.c
@@ -17,7 +17,7 @@
#include <linux/virtio_net.h>
#include <netinet/ip.h>
#include <netinet/udp.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const char param_dev_tap_name[] = "xmacvtap0";
static const char param_dev_dummy_name[] = "xdummy0";
--- a/tools/testing/selftests/net/tcp_ao/lib/setup.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tcp_ao/lib/setup.c
@@ -9,7 +9,7 @@
* Can't be included in the header: it defines static variables which
* will be unique to every object. Let's include it only once here.
*/
-#include "../../../kselftest.h"
+#include "kselftest.h"
/* Prevent overriding of one thread's output by another */
static pthread_mutex_t ksft_print_lock = PTHREAD_MUTEX_INITIALIZER;
--- a/tools/testing/selftests/net/tcp_fastopen_backup_key.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tcp_fastopen_backup_key.c
@@ -26,7 +26,7 @@
#include <fcntl.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef TCP_FASTOPEN_KEY
#define TCP_FASTOPEN_KEY 33
--- a/tools/testing/selftests/net/tls.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tls.c
@@ -21,7 +21,7 @@
#include <sys/socket.h>
#include <sys/stat.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TLS_PAYLOAD_MAX_LEN 16384
#define SOL_TLS 282
--- a/tools/testing/selftests/net/toeplitz.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/toeplitz.c
@@ -52,7 +52,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TOEPLITZ_KEY_MIN_LEN 40
#define TOEPLITZ_KEY_MAX_LEN 60
--- a/tools/testing/selftests/net/tun.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tun.c
@@ -15,7 +15,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static int tun_attach(int fd, char *dev)
{
--- a/tools/testing/selftests/net/udpgso_bench_tx.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/udpgso_bench_tx.c
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef ETH_MAX_MTU
#define ETH_MAX_MTU 0xFFFFU
--- a/tools/testing/selftests/openat2/helpers.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/helpers.h
@@ -12,7 +12,7 @@
#include <stdbool.h>
#include <errno.h>
#include <linux/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ARRAY_LEN(X) (sizeof (X) / sizeof (*(X)))
#define BUILD_BUG_ON(e) ((void)(sizeof(struct { int:(-!!(e)); })))
--- a/tools/testing/selftests/openat2/openat2_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/openat2_test.c
@@ -15,7 +15,7 @@
#include <stdbool.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "helpers.h"
/*
--- a/tools/testing/selftests/openat2/rename_attack_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/rename_attack_test.c
@@ -22,7 +22,7 @@
#include <limits.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "helpers.h"
/* Construct a test directory with the following structure:
--- a/tools/testing/selftests/openat2/resolve_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/resolve_test.c
@@ -14,7 +14,7 @@
#include <stdbool.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "helpers.h"
/*
--- a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c
@@ -20,7 +20,7 @@
#include "../../../../include/uapi/linux/pcitest.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define pci_ep_ioctl(cmd, arg) \
({ \
--- a/tools/testing/selftests/perf_events/mmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/mmap.c
@@ -14,7 +14,7 @@
#include <linux/perf_event.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define RB_SIZE 0x3000
#define AUX_SIZE 0x10000
--- a/tools/testing/selftests/perf_events/remove_on_exec.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/remove_on_exec.c
@@ -30,7 +30,7 @@
#include <sys/syscall.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static volatile int signal_count;
--- a/tools/testing/selftests/perf_events/sigtrap_threads.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/sigtrap_threads.c
@@ -31,7 +31,7 @@
#include <sys/syscall.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define NUM_THREADS 5
--- a/tools/testing/selftests/perf_events/watermark_signal.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/watermark_signal.c
@@ -15,7 +15,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static int sigio_count;
--- a/tools/testing/selftests/pidfd/pidfd_bind_mount.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_bind_mount.c
@@ -14,7 +14,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../filesystems/wrappers.h"
FIXTURE(pidfd_bind_mount) {
--- a/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c
@@ -16,7 +16,7 @@
#include <sys/mount.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
struct error {
int code;
--- a/tools/testing/selftests/pidfd/pidfd_file_handle_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_file_handle_test.c
@@ -20,7 +20,7 @@
#include <sys/stat.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(file_handle)
{
--- a/tools/testing/selftests/pidfd/pidfd_getfd_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_getfd_test.c
@@ -19,7 +19,7 @@
#include <linux/kcmp.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
/*
* UNKNOWN_FD is an fd number that should never exist in the child, as it is
--- a/tools/testing/selftests/pidfd/pidfd.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd.h
@@ -25,7 +25,7 @@
#undef SCHED_FLAG_KEEP_ALL
#undef SCHED_FLAG_UTIL_CLAMP
-#include "../kselftest.h"
+#include "kselftest.h"
#include "../clone3/clone3_selftests.h"
#ifndef FD_PIDFS_ROOT
--- a/tools/testing/selftests/pidfd/pidfd_info_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_info_test.c
@@ -21,7 +21,7 @@
#include <sys/stat.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(pidfd_info)
{
--- a/tools/testing/selftests/pidfd/pidfd_open_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_open_test.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
static int safe_int(const char *numstr, int *converted)
{
--- a/tools/testing/selftests/pidfd/pidfd_poll_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_poll_test.c
@@ -14,7 +14,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
static bool timeout;
--- a/tools/testing/selftests/pidfd/pidfd_setattr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_setattr_test.c
@@ -22,7 +22,7 @@
#include <sys/xattr.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(pidfs_setattr)
{
--- a/tools/testing/selftests/pidfd/pidfd_setns_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_setns_test.c
@@ -18,7 +18,7 @@
#include <sys/stat.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
enum {
PIDFD_NS_USER,
--- a/tools/testing/selftests/pidfd/pidfd_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_test.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define str(s) _str(s)
#define _str(s) #s
--- a/tools/testing/selftests/pidfd/pidfd_wait.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_wait.c
@@ -17,7 +17,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
--- a/tools/testing/selftests/pidfd/pidfd_xattr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_xattr_test.c
@@ -22,7 +22,7 @@
#include <sys/xattr.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(pidfs_xattr)
{
--- a/tools/testing/selftests/pid_namespace/pid_max.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pid_namespace/pid_max.c
@@ -13,7 +13,7 @@
#include <sys/mount.h>
#include <sys/wait.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../pidfd/pidfd.h"
#define __STACK_SIZE (8 * 1024 * 1024)
--- a/tools/testing/selftests/pid_namespace/regression_enomem.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pid_namespace/regression_enomem.c
@@ -11,7 +11,7 @@
#include <syscall.h>
#include <sys/wait.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../pidfd/pidfd.h"
/*
--- a/tools/testing/selftests/prctl/set-anon-vma-name-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/prctl/set-anon-vma-name-test.c
@@ -10,7 +10,7 @@
#include <sys/mman.h>
#include <string.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define AREA_SIZE 1024
--- a/tools/testing/selftests/prctl/set-process-name.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/prctl/set-process-name.c
@@ -7,7 +7,7 @@
#include <sys/prctl.h>
#include <string.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define CHANGE_NAME "changename"
#define EMPTY_NAME ""
--- a/tools/testing/selftests/proc/proc-maps-race.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/proc/proc-maps-race.c
@@ -23,7 +23,7 @@
*
*/
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
--- a/tools/testing/selftests/proc/proc-pid-vm.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/proc/proc-pid-vm.c
@@ -51,7 +51,7 @@
#define __maybe_unused __attribute__((__unused__))
#endif
-#include "../kselftest.h"
+#include "kselftest.h"
static inline long sys_execveat(int dirfd, const char *pathname, char **argv, char **envp, int flags)
{
--- a/tools/testing/selftests/ptrace/get_set_sud.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/get_set_sud.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <stdio.h>
#include <string.h>
#include <errno.h>
--- a/tools/testing/selftests/ptrace/get_syscall_info.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/get_syscall_info.c
@@ -7,7 +7,7 @@
* matches userspace expectations.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <err.h>
#include <signal.h>
#include <asm/unistd.h>
--- a/tools/testing/selftests/ptrace/set_syscall_info.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/set_syscall_info.c
@@ -7,7 +7,7 @@
* matches userspace expectations.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <err.h>
#include <fcntl.h>
#include <signal.h>
--- a/tools/testing/selftests/ptrace/vmaccess.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/vmaccess.c
@@ -7,7 +7,7 @@
* when de_thread is blocked with ->cred_guard_mutex held.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <stdio.h>
#include <fcntl.h>
#include <pthread.h>
--- a/tools/testing/selftests/resctrl/resctrl.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/resctrl/resctrl.h
@@ -23,7 +23,7 @@
#include <asm/unistd.h>
#include <linux/perf_event.h>
#include <linux/compiler.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MB (1024 * 1024)
#define RESCTRL_PATH "/sys/fs/resctrl"
--- a/tools/testing/selftests/ring-buffer/map_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ring-buffer/map_test.c
@@ -17,7 +17,7 @@
#include <sys/ioctl.h>
#include "../user_events/user_events_selftests.h" /* share tracefs setup */
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TRACEFS_ROOT "/sys/kernel/tracing"
--- a/tools/testing/selftests/riscv/abi/pointer_masking.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/abi/pointer_masking.c
@@ -9,7 +9,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#ifndef PR_PMLEN_SHIFT
#define PR_PMLEN_SHIFT 24
--- a/tools/testing/selftests/riscv/hwprobe/cbo.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/hwprobe/cbo.c
@@ -17,7 +17,7 @@
#include <asm/ucontext.h>
#include "hwprobe.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
#define MK_CBO(fn) le32_bswap((uint32_t)(fn) << 20 | 10 << 15 | 2 << 12 | 0 << 7 | 15)
--- a/tools/testing/selftests/riscv/hwprobe/hwprobe.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/hwprobe/hwprobe.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "hwprobe.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/riscv/hwprobe/which-cpus.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/hwprobe/which-cpus.c
@@ -14,7 +14,7 @@
#include <assert.h>
#include "hwprobe.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
static void help(void)
{
--- a/tools/testing/selftests/riscv/mm/mmap_bottomup.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/mm/mmap_bottomup.c
@@ -2,7 +2,7 @@
#include <sys/mman.h>
#include <mmap_test.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
TEST(infinite_rlimit)
{
--- a/tools/testing/selftests/riscv/mm/mmap_default.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/mm/mmap_default.c
@@ -2,7 +2,7 @@
#include <sys/mman.h>
#include <mmap_test.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
TEST(default_rlimit)
{
--- a/tools/testing/selftests/riscv/mm/mmap_test.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/mm/mmap_test.h
@@ -5,7 +5,7 @@
#include <sys/resource.h>
#include <stddef.h>
#include <strings.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TOP_DOWN 0
#define BOTTOM_UP 1
--- a/tools/testing/selftests/riscv/sigreturn/sigreturn.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/sigreturn/sigreturn.c
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <ucontext.h>
#include <linux/ptrace.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define RISCV_V_MAGIC 0x53465457
#define DEFAULT_VALUE 2
--- a/tools/testing/selftests/riscv/vector/v_initval.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/vector/v_initval.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "v_helpers.h"
#define NEXT_PROGRAM "./v_exec_initval_nolibc"
--- a/tools/testing/selftests/riscv/vector/vstate_prctl.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/vector/vstate_prctl.c
@@ -6,7 +6,7 @@
#include <sys/types.h>
#include <stdlib.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "v_helpers.h"
#define NEXT_PROGRAM "./vstate_exec_nolibc"
--- a/tools/testing/selftests/rseq/basic_percpu_ops_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/rseq/basic_percpu_ops_test.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <stddef.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "rseq.h"
#ifdef BUILDOPT_RSEQ_PERCPU_MM_CID
--- a/tools/testing/selftests/rseq/rseq.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/rseq/rseq.c
@@ -33,7 +33,7 @@
#include <linux/compiler.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "rseq.h"
/*
--- a/tools/testing/selftests/rtc/rtctest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/rtc/rtctest.c
@@ -16,7 +16,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define NUM_UIE 3
#define ALARM_DELTA 3
--- a/tools/testing/selftests/seccomp/seccomp_benchmark.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/seccomp/seccomp_benchmark.c
@@ -20,7 +20,7 @@
#include <sys/syscall.h>
#include <sys/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
unsigned long long timing(clockid_t clk_id, unsigned long long samples)
{
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -53,7 +53,7 @@
#include <sys/syscall.h>
#include <poll.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../clone3/clone3_selftests.h"
/* Attempt to de-conflict with the selftests tree. */
--- a/tools/testing/selftests/sgx/main.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sgx/main.c
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <sys/auxv.h>
#include "defines.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "main.h"
static const uint64_t MAGIC = 0x1122334455667788ULL;
--- a/tools/testing/selftests/signal/mangle_uc_sigmask.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/signal/mangle_uc_sigmask.c
@@ -39,7 +39,7 @@
#include <signal.h>
#include <ucontext.h>
-#include "../kselftest.h"
+#include "kselftest.h"
void handler_verify_ucontext(int signo, siginfo_t *info, void *uc)
{
--- a/tools/testing/selftests/signal/sas.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/signal/sas.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include <sys/auxv.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "current_stack_pointer.h"
#ifndef SS_AUTODISARM
--- a/tools/testing/selftests/sparc64/drivers/adi-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sparc64/drivers/adi-test.c
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define DEBUG_LEVEL_1_BIT (0x0001)
#define DEBUG_LEVEL_2_BIT (0x0002)
--- a/tools/testing/selftests/sync/Makefile~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sync/Makefile
@@ -33,6 +33,6 @@ $(OBJS): $(OUTPUT)/%.o: %.c
$(CC) -c $^ -o $@ $(CFLAGS)
$(TESTS): $(OUTPUT)/%.o: %.c
- $(CC) -c $^ -o $@
+ $(CC) -c $^ -o $@ $(CFLAGS)
EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS)
--- a/tools/testing/selftests/sync/sync_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sync/sync_test.c
@@ -34,7 +34,7 @@
#include <errno.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "synctest.h"
static int run_test(int (*test)(void), char *name)
--- a/tools/testing/selftests/sync/synctest.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sync/synctest.h
@@ -29,7 +29,7 @@
#define SELFTESTS_SYNCTEST_H
#include <stdio.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ASSERT(cond, msg) do { \
if (!(cond)) { \
--- a/tools/testing/selftests/syscall_user_dispatch/sud_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/syscall_user_dispatch/sud_test.c
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <asm/unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef PR_SET_SYSCALL_USER_DISPATCH
# define PR_SET_SYSCALL_USER_DISPATCH 59
--- a/tools/testing/selftests/tdx/tdx_guest_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/tdx/tdx_guest_test.c
@@ -13,7 +13,7 @@
#include <fcntl.h>
#include <linux/tdx-guest.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TDX_GUEST_DEVNAME "/dev/tdx_guest"
#define HEX_DUMP_SIZE 8
--- a/tools/testing/selftests/timens/timens.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timens/timens.h
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef CLONE_NEWTIME
# define CLONE_NEWTIME 0x00000080
--- a/tools/testing/selftests/timers/adjtick.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/adjtick.c
@@ -24,7 +24,7 @@
#include <time.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MILLION 1000000
--- a/tools/testing/selftests/timers/alarmtimer-suspend.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/alarmtimer-suspend.c
@@ -30,7 +30,7 @@
#include <pthread.h>
#include <include/vdso/time64.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define UNREASONABLE_LAT (NSEC_PER_SEC * 5) /* hopefully we resume in 5 secs */
--- a/tools/testing/selftests/timers/change_skew.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/change_skew.c
@@ -28,7 +28,7 @@
#include <sys/time.h>
#include <sys/timex.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int change_skew_test(int ppm)
{
--- a/tools/testing/selftests/timers/clocksource-switch.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/clocksource-switch.c
@@ -34,7 +34,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int get_clocksources(char list[][30])
--- a/tools/testing/selftests/timers/freq-step.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/freq-step.c
@@ -15,7 +15,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define SAMPLES 100
#define SAMPLE_READINGS 10
--- a/tools/testing/selftests/timers/inconsistency-check.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/inconsistency-check.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <signal.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
#define CLOCK_HWSPECIFIC 10
--- a/tools/testing/selftests/timers/leap-a-day.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/leap-a-day.c
@@ -49,7 +49,7 @@
#include <signal.h>
#include <unistd.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define CLOCK_TAI 11
--- a/tools/testing/selftests/timers/leapcrash.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/leapcrash.c
@@ -22,7 +22,7 @@
#include <sys/timex.h>
#include <string.h>
#include <signal.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* clear NTP time_status & time_state */
int clear_time_state(void)
--- a/tools/testing/selftests/timers/mqueue-lat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/mqueue-lat.c
@@ -30,7 +30,7 @@
#include <errno.h>
#include <mqueue.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TARGET_TIMEOUT 100000000 /* 100ms in nanoseconds */
--- a/tools/testing/selftests/timers/nanosleep.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/nanosleep.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <signal.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
#define CLOCK_HWSPECIFIC 10
--- a/tools/testing/selftests/timers/nsleep-lat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/nsleep-lat.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <signal.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define UNRESONABLE_LATENCY 40000000 /* 40ms in nanosecs */
--- a/tools/testing/selftests/timers/posix_timers.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/posix_timers.c
@@ -19,7 +19,7 @@
#include <include/vdso/time64.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define DELAY 2
--- a/tools/testing/selftests/timers/raw_skew.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/raw_skew.c
@@ -26,7 +26,7 @@
#include <sys/timex.h>
#include <time.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define shift_right(x, s) ({ \
__typeof__(x) __x = (x); \
--- a/tools/testing/selftests/timers/rtcpie.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/rtcpie.c
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/*
* This expects the new RTC class driver framework, working with
--- a/tools/testing/selftests/timers/set-2038.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-2038.c
@@ -28,7 +28,7 @@
#include <time.h>
#include <sys/time.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define KTIME_MAX ((long long)~((unsigned long long)1 << 63))
#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
--- a/tools/testing/selftests/timers/set-tai.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-tai.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <signal.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int set_tai(int offset)
{
--- a/tools/testing/selftests/timers/set-timer-lat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-timer-lat.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
#define CLOCK_HWSPECIFIC 10
--- a/tools/testing/selftests/timers/set-tz.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-tz.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <signal.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int set_tz(int min, int dst)
{
--- a/tools/testing/selftests/timers/skew_consistency.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/skew_consistency.c
@@ -34,7 +34,7 @@
#include <fcntl.h>
#include <string.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/timers/threadtest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/threadtest.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <sys/time.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* serializes shared list access */
pthread_mutex_t list_lock = PTHREAD_MUTEX_INITIALIZER;
--- a/tools/testing/selftests/timers/valid-adjtimex.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/valid-adjtimex.c
@@ -30,7 +30,7 @@
#include <signal.h>
#include <unistd.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ADJ_SETOFFSET 0x0100
--- a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c
@@ -23,7 +23,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/tty/tty_tstamp_update.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/tty/tty_tstamp_update.c
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <linux/limits.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MIN_TTY_PATH_LEN 8
--- a/tools/testing/selftests/uevent/uevent_filtering.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/uevent/uevent_filtering.c
@@ -19,7 +19,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define __DEV_FULL "/sys/devices/virtual/mem/full/uevent"
#define __UEVENT_BUFFER_SIZE (2048 * 2)
--- a/tools/testing/selftests/user_events/abi_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/abi_test.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <asm/unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *data_file = "/sys/kernel/tracing/user_events_data";
--- a/tools/testing/selftests/user_events/dyn_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/dyn_test.c
@@ -14,7 +14,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *dyn_file = "/sys/kernel/tracing/dynamic_events";
--- a/tools/testing/selftests/user_events/ftrace_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/ftrace_test.c
@@ -15,7 +15,7 @@
#include <sys/uio.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *data_file = "/sys/kernel/tracing/user_events_data";
--- a/tools/testing/selftests/user_events/perf_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/perf_test.c
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <asm/unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *data_file = "/sys/kernel/tracing/user_events_data";
--- a/tools/testing/selftests/user_events/user_events_selftests.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/user_events_selftests.h
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static inline void tracefs_unmount(void)
{
--- a/tools/testing/selftests/vDSO/vdso_test_abi.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_abi.c
@@ -18,7 +18,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vdso_config.h"
#include "vdso_call.h"
#include "parse_vdso.h"
--- a/tools/testing/selftests/vDSO/vdso_test_chacha.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_chacha.c
@@ -10,7 +10,7 @@
#include <string.h>
#include <stdint.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#if defined(__aarch64__)
static bool cpu_has_capabilities(void)
--- a/tools/testing/selftests/vDSO/vdso_test_clock_getres.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_clock_getres.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static long syscall_clock_getres(clockid_t _clkid, struct timespec *_ts)
{
--- a/tools/testing/selftests/vDSO/vdso_test_correctness.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_correctness.c
@@ -21,7 +21,7 @@
#include "vdso_config.h"
#include "vdso_call.h"
-#include "../kselftest.h"
+#include "kselftest.h"
static const char **name;
--- a/tools/testing/selftests/vDSO/vdso_test_getcpu.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_getcpu.c
@@ -11,7 +11,7 @@
#include <sys/auxv.h>
#include <sys/time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "parse_vdso.h"
#include "vdso_config.h"
#include "vdso_call.h"
--- a/tools/testing/selftests/vDSO/vdso_test_getrandom.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_getrandom.c
@@ -23,7 +23,7 @@
#include <linux/random.h>
#include <linux/ptrace.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "parse_vdso.h"
#include "vdso_config.h"
#include "vdso_call.h"
--- a/tools/testing/selftests/vDSO/vdso_test_gettimeofday.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_gettimeofday.c
@@ -16,7 +16,7 @@
#include <sys/time.h>
#endif
-#include "../kselftest.h"
+#include "kselftest.h"
#include "parse_vdso.h"
#include "vdso_config.h"
#include "vdso_call.h"
--- a/tools/testing/selftests/x86/corrupt_xstate_header.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/corrupt_xstate_header.c
@@ -17,7 +17,7 @@
#include <stdint.h>
#include <sys/wait.h>
-#include "../kselftest.h" /* For __cpuid_count() */
+#include "kselftest.h" /* For __cpuid_count() */
#include "helpers.h"
static inline int xsave_enabled(void)
--- a/tools/testing/selftests/x86/helpers.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/helpers.h
@@ -7,7 +7,7 @@
#include <asm/processor-flags.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static inline unsigned long get_eflags(void)
{
--- a/tools/testing/selftests/x86/lam.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/lam.c
@@ -18,7 +18,7 @@
#include <sys/uio.h>
#include <linux/io_uring.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef __x86_64__
# error This test is 64-bit only
--- a/tools/testing/selftests/x86/syscall_numbering.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/syscall_numbering.c
@@ -25,7 +25,7 @@
#include <sys/mman.h>
#include <linux/ptrace.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* Common system call numbers */
#define SYS_READ 0
--- a/tools/testing/selftests/x86/test_mremap_vdso.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/test_mremap_vdso.c
@@ -20,7 +20,7 @@
#include <sys/auxv.h>
#include <sys/syscall.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define PAGE_SIZE 4096
--- a/tools/testing/selftests/x86/test_vsyscall.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/test_vsyscall.c
@@ -21,7 +21,7 @@
#include <sys/uio.h>
#include "helpers.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#ifdef __x86_64__
#define TOTAL_TESTS 13
--- a/tools/testing/selftests/x86/xstate.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/xstate.h
@@ -4,7 +4,7 @@
#include <stdint.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define XSAVE_HDR_OFFSET 512
#define XSAVE_HDR_SIZE 64
_
Patches currently in -mm which might be from reddybalavignesh9979@gmail.com are
selftests-centralise-maybe-unused-definition-in-kselftesth.patch
selftests-proc-mark-vsyscall-strings-maybe-unused.patch
selftests-centralize-include-path-for-kselftesth-and-kselftest_harnessh.patch
selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
* + selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch added to mm-nonmm-unstable branch
@ 2025-08-31 20:05 Andrew Morton
0 siblings, 0 replies; 2+ messages in thread
From: Andrew Morton @ 2025-08-31 20:05 UTC (permalink / raw)
To: mm-commits, vbabka, surenb, shuah, rppt, richard.weiyang, pabeni,
ming.lei, mic, mhocko, lorenzo.stoakes, liam.howlett, kuba, horms,
gnoack, edumazet, david, davem, reddybalavignesh9979, akpm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 132850 bytes --]
The patch titled
Subject: selftests: replace relative includes with non-relative for kselftest.h and kselftest_harness.h
has been added to the -mm mm-nonmm-unstable branch. Its filename is
selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch
This patch will shortly appear at
https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch
This patch will later appear in the mm-nonmm-unstable branch at
git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days
------------------------------------------------------
From: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Subject: selftests: replace relative includes with non-relative for kselftest.h and kselftest_harness.h
Date: Sat, 30 Aug 2025 22:09:49 +0530
Replace relative path of kselftest.h and kselftest_harness.h with a
non-relative path
Link: https://lkml.kernel.org/r/20250830163949.20952-3-reddybalavignesh9979@gmail.com
Signed-off-by: Bala-Vignesh-Reddy <reddybalavignesh9979@gmail.com>
Reviewed-by: Wei Yang <richard.weiyang@gmail.com>
Cc: David Hildenbrand <david@redhat.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Günther Noack <gnoack@google.com>
Cc: Jakub Kacinski <kuba@kernel.org>
Cc: Liam Howlett <liam.howlett@oracle.com>
Cc: Lorenzo Stoakes <lorenzo.stoakes@oracle.com>
Cc: Michal Hocko <mhocko@suse.com>
Cc: Mickael Salaun <mic@digikod.net>
Cc: Mike Rapoport <rppt@kernel.org>
Cc: Ming Lei <ming.lei@redhat.com>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Shuah Khan <shuah@kernel.org>
Cc: Simon Horman <horms@kernel.org>
Cc: Suren Baghdasaryan <surenb@google.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
tools/testing/selftests/acct/acct_syscall.c | 2 +-
tools/testing/selftests/alsa/conf.c | 2 +-
tools/testing/selftests/alsa/mixer-test.c | 2 +-
tools/testing/selftests/alsa/pcm-test.c | 2 +-
tools/testing/selftests/alsa/test-pcmtest-driver.c | 2 +-
tools/testing/selftests/alsa/utimer-test.c | 2 +-
tools/testing/selftests/arm64/abi/hwcap.c | 2 +-
tools/testing/selftests/arm64/abi/ptrace.c | 2 +-
tools/testing/selftests/arm64/abi/syscall-abi.c | 2 +-
tools/testing/selftests/arm64/fp/fp-ptrace.c | 2 +-
tools/testing/selftests/arm64/fp/fp-stress.c | 2 +-
tools/testing/selftests/arm64/fp/sve-probe-vls.c | 2 +-
tools/testing/selftests/arm64/fp/sve-ptrace.c | 2 +-
tools/testing/selftests/arm64/fp/vec-syscfg.c | 2 +-
tools/testing/selftests/arm64/fp/za-ptrace.c | 2 +-
tools/testing/selftests/arm64/fp/zt-ptrace.c | 2 +-
tools/testing/selftests/arm64/gcs/gcs-stress.c | 2 +-
tools/testing/selftests/arm64/pauth/pac.c | 2 +-
tools/testing/selftests/arm64/tags/tags_test.c | 2 +-
tools/testing/selftests/bpf/xskxceiver.c | 2 +-
tools/testing/selftests/breakpoints/breakpoint_test.c | 2 +-
tools/testing/selftests/breakpoints/breakpoint_test_arm64.c | 2 +-
tools/testing/selftests/breakpoints/step_after_suspend_test.c | 2 +-
tools/testing/selftests/cachestat/test_cachestat.c | 2 +-
tools/testing/selftests/capabilities/test_execve.c | 2 +-
tools/testing/selftests/capabilities/validate_cap.c | 2 +-
tools/testing/selftests/cgroup/test_core.c | 2 +-
tools/testing/selftests/cgroup/test_cpu.c | 2 +-
tools/testing/selftests/cgroup/test_cpuset.c | 2 +-
tools/testing/selftests/cgroup/test_freezer.c | 2 +-
tools/testing/selftests/cgroup/test_hugetlb_memcg.c | 2 +-
tools/testing/selftests/cgroup/test_kill.c | 2 +-
tools/testing/selftests/cgroup/test_kmem.c | 2 +-
tools/testing/selftests/cgroup/test_memcontrol.c | 2 +-
tools/testing/selftests/cgroup/test_pids.c | 2 +-
tools/testing/selftests/cgroup/test_zswap.c | 2 +-
tools/testing/selftests/clone3/clone3.c | 2 +-
tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c | 2 +-
tools/testing/selftests/clone3/clone3_clear_sighand.c | 2 +-
tools/testing/selftests/clone3/clone3_selftests.h | 2 +-
tools/testing/selftests/clone3/clone3_set_tid.c | 2 +-
tools/testing/selftests/connector/proc_filter.c | 2 +-
tools/testing/selftests/core/close_range_test.c | 2 +-
tools/testing/selftests/core/unshare_test.c | 2 +-
tools/testing/selftests/coredump/stackdump_test.c | 2 +-
tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 2 +-
tools/testing/selftests/drivers/dma-buf/udmabuf.c | 2 +-
tools/testing/selftests/drivers/ntsync/ntsync.c | 2 +-
tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c | 2 +-
tools/testing/selftests/exec/check-exec.c | 2 +-
tools/testing/selftests/exec/execveat.c | 2 +-
tools/testing/selftests/exec/load_address.c | 2 +-
tools/testing/selftests/exec/non-regular.c | 2 +-
tools/testing/selftests/exec/null-argv.c | 2 +-
tools/testing/selftests/exec/recursion-depth.c | 2 +-
tools/testing/selftests/fchmodat2/fchmodat2_test.c | 2 +-
tools/testing/selftests/filelock/ofdlocks.c | 2 +-
tools/testing/selftests/filesystems/anon_inode_test.c | 2 +-
tools/testing/selftests/filesystems/binderfs/binderfs_test.c | 2 +-
tools/testing/selftests/filesystems/devpts_pts.c | 2 +-
tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c | 2 +-
tools/testing/selftests/filesystems/eventfd/eventfd_test.c | 2 +-
tools/testing/selftests/filesystems/file_stressor.c | 2 +-
tools/testing/selftests/filesystems/kernfs_test.c | 2 +-
tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c | 2 +-
tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c | 2 +-
tools/testing/selftests/filesystems/nsfs/iterate_mntns.c | 2 +-
tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c | 2 +-
tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c | 2 +-
tools/testing/selftests/filesystems/statmount/listmount_test.c | 2 +-
tools/testing/selftests/filesystems/statmount/statmount_test.c | 2 +-
tools/testing/selftests/filesystems/statmount/statmount_test_ns.c | 2 +-
tools/testing/selftests/filesystems/utils.c | 2 +-
tools/testing/selftests/hid/hid_common.h | 2 +-
tools/testing/selftests/intel_pstate/aperf.c | 2 +-
tools/testing/selftests/iommu/iommufd_utils.h | 2 +-
tools/testing/selftests/ipc/msgque.c | 2 +-
tools/testing/selftests/ir/ir_loopback.c | 2 +-
tools/testing/selftests/kcmp/kcmp_test.c | 2 +-
tools/testing/selftests/kselftest_harness.h | 2 +-
tools/testing/selftests/kselftest_harness/harness-selftest.c | 2 +-
tools/testing/selftests/landlock/common.h | 2 +-
tools/testing/selftests/lsm/lsm_get_self_attr_test.c | 2 +-
tools/testing/selftests/lsm/lsm_list_modules_test.c | 2 +-
tools/testing/selftests/lsm/lsm_set_self_attr_test.c | 2 +-
tools/testing/selftests/media_tests/media_device_open.c | 2 +-
tools/testing/selftests/media_tests/media_device_test.c | 2 +-
tools/testing/selftests/membarrier/membarrier_test_impl.h | 2 +-
tools/testing/selftests/mincore/mincore_selftest.c | 4 ++--
tools/testing/selftests/mm/compaction_test.c | 2 +-
tools/testing/selftests/mm/cow.c | 2 +-
tools/testing/selftests/mm/droppable.c | 2 +-
tools/testing/selftests/mm/guard-regions.c | 2 +-
tools/testing/selftests/mm/gup_longterm.c | 2 +-
tools/testing/selftests/mm/gup_test.c | 2 +-
tools/testing/selftests/mm/hmm-tests.c | 2 +-
tools/testing/selftests/mm/hugepage-mmap.c | 2 +-
tools/testing/selftests/mm/hugepage-mremap.c | 2 +-
tools/testing/selftests/mm/hugetlb-madvise.c | 2 +-
tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 2 +-
tools/testing/selftests/mm/hugetlb-soft-offline.c | 2 +-
tools/testing/selftests/mm/hugetlb_dio.c | 2 +-
tools/testing/selftests/mm/hugetlb_fault_after_madv.c | 2 +-
tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 2 +-
tools/testing/selftests/mm/ksm_functional_tests.c | 2 +-
tools/testing/selftests/mm/ksm_tests.c | 2 +-
tools/testing/selftests/mm/madv_populate.c | 2 +-
tools/testing/selftests/mm/map_fixed_noreplace.c | 2 +-
tools/testing/selftests/mm/map_hugetlb.c | 2 +-
tools/testing/selftests/mm/map_populate.c | 2 +-
tools/testing/selftests/mm/mdwe_test.c | 2 +-
tools/testing/selftests/mm/memfd_secret.c | 2 +-
tools/testing/selftests/mm/merge.c | 2 +-
tools/testing/selftests/mm/migration.c | 2 +-
tools/testing/selftests/mm/mkdirty.c | 2 +-
tools/testing/selftests/mm/mlock-random-test.c | 2 +-
tools/testing/selftests/mm/mlock2-tests.c | 2 +-
tools/testing/selftests/mm/mrelease_test.c | 2 +-
tools/testing/selftests/mm/mremap_dontunmap.c | 2 +-
tools/testing/selftests/mm/mremap_test.c | 2 +-
tools/testing/selftests/mm/mseal_test.c | 2 +-
tools/testing/selftests/mm/on-fault-limit.c | 2 +-
tools/testing/selftests/mm/pagemap_ioctl.c | 2 +-
tools/testing/selftests/mm/pfnmap.c | 2 +-
tools/testing/selftests/mm/pkey-helpers.h | 2 +-
tools/testing/selftests/mm/process_madv.c | 2 +-
tools/testing/selftests/mm/soft-dirty.c | 2 +-
tools/testing/selftests/mm/split_huge_page_test.c | 2 +-
tools/testing/selftests/mm/thuge-gen.c | 2 +-
tools/testing/selftests/mm/transhuge-stress.c | 2 +-
tools/testing/selftests/mm/uffd-common.h | 2 +-
tools/testing/selftests/mm/uffd-wp-mremap.c | 2 +-
tools/testing/selftests/mm/va_high_addr_switch.c | 2 +-
tools/testing/selftests/mm/virtual_address_range.c | 2 +-
tools/testing/selftests/mm/vm_util.c | 2 +-
tools/testing/selftests/mm/vm_util.h | 2 +-
tools/testing/selftests/mount_setattr/mount_setattr_test.c | 2 +-
tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c | 2 +-
tools/testing/selftests/mqueue/mq_open_tests.c | 2 +-
tools/testing/selftests/mqueue/mq_perf_tests.c | 2 +-
tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c | 4 ++--
tools/testing/selftests/nci/nci_dev.c | 2 +-
tools/testing/selftests/net/af_unix/diag_uid.c | 2 +-
tools/testing/selftests/net/af_unix/msg_oob.c | 2 +-
tools/testing/selftests/net/af_unix/scm_inq.c | 2 +-
tools/testing/selftests/net/af_unix/scm_pidfd.c | 2 +-
tools/testing/selftests/net/af_unix/scm_rights.c | 2 +-
tools/testing/selftests/net/af_unix/unix_connect.c | 2 +-
tools/testing/selftests/net/bind_timewait.c | 2 +-
tools/testing/selftests/net/bind_wildcard.c | 2 +-
tools/testing/selftests/net/can/test_raw_filter.c | 2 +-
tools/testing/selftests/net/cmsg_sender.c | 2 +-
tools/testing/selftests/net/epoll_busy_poll.c | 2 +-
tools/testing/selftests/net/gro.c | 2 +-
tools/testing/selftests/net/ip_local_port_range.c | 2 +-
tools/testing/selftests/net/ipsec.c | 2 +-
tools/testing/selftests/net/netfilter/conntrack_dump_flush.c | 2 +-
tools/testing/selftests/net/netlink-dumps.c | 2 +-
tools/testing/selftests/net/proc_net_pktgen.c | 2 +-
tools/testing/selftests/net/psock_fanout.c | 2 +-
tools/testing/selftests/net/psock_tpacket.c | 2 +-
tools/testing/selftests/net/reuseaddr_ports_exhausted.c | 2 +-
tools/testing/selftests/net/reuseport_bpf.c | 2 +-
tools/testing/selftests/net/reuseport_bpf_numa.c | 2 +-
tools/testing/selftests/net/rxtimestamp.c | 2 +-
tools/testing/selftests/net/sk_so_peek_off.c | 2 +-
tools/testing/selftests/net/so_incoming_cpu.c | 2 +-
tools/testing/selftests/net/socket.c | 2 +-
tools/testing/selftests/net/tap.c | 2 +-
tools/testing/selftests/net/tcp_ao/lib/setup.c | 2 +-
tools/testing/selftests/net/tcp_fastopen_backup_key.c | 2 +-
tools/testing/selftests/net/tls.c | 2 +-
tools/testing/selftests/net/toeplitz.c | 2 +-
tools/testing/selftests/net/tun.c | 2 +-
tools/testing/selftests/net/udpgso_bench_tx.c | 2 +-
tools/testing/selftests/openat2/helpers.h | 2 +-
tools/testing/selftests/openat2/openat2_test.c | 2 +-
tools/testing/selftests/openat2/rename_attack_test.c | 2 +-
tools/testing/selftests/openat2/resolve_test.c | 2 +-
tools/testing/selftests/pci_endpoint/pci_endpoint_test.c | 2 +-
tools/testing/selftests/perf_events/mmap.c | 2 +-
tools/testing/selftests/perf_events/remove_on_exec.c | 2 +-
tools/testing/selftests/perf_events/sigtrap_threads.c | 2 +-
tools/testing/selftests/pid_namespace/pid_max.c | 2 +-
tools/testing/selftests/pid_namespace/regression_enomem.c | 2 +-
tools/testing/selftests/pidfd/pidfd.h | 2 +-
tools/testing/selftests/pidfd/pidfd_bind_mount.c | 2 +-
tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_file_handle_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_getfd_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_info_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_open_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_setattr_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_setns_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_test.c | 2 +-
tools/testing/selftests/pidfd/pidfd_wait.c | 2 +-
tools/testing/selftests/pidfd/pidfd_xattr_test.c | 2 +-
tools/testing/selftests/prctl/set-anon-vma-name-test.c | 2 +-
tools/testing/selftests/prctl/set-process-name.c | 2 +-
tools/testing/selftests/proc/proc-maps-race.c | 2 +-
tools/testing/selftests/proc/proc-pid-vm.c | 2 +-
tools/testing/selftests/ptrace/get_set_sud.c | 2 +-
tools/testing/selftests/ptrace/get_syscall_info.c | 2 +-
tools/testing/selftests/ptrace/set_syscall_info.c | 2 +-
tools/testing/selftests/ptrace/vmaccess.c | 2 +-
tools/testing/selftests/resctrl/resctrl.h | 2 +-
tools/testing/selftests/ring-buffer/map_test.c | 2 +-
tools/testing/selftests/riscv/abi/pointer_masking.c | 2 +-
tools/testing/selftests/riscv/hwprobe/cbo.c | 2 +-
tools/testing/selftests/riscv/hwprobe/hwprobe.c | 2 +-
tools/testing/selftests/riscv/hwprobe/which-cpus.c | 2 +-
tools/testing/selftests/riscv/mm/mmap_bottomup.c | 2 +-
tools/testing/selftests/riscv/mm/mmap_default.c | 2 +-
tools/testing/selftests/riscv/mm/mmap_test.h | 2 +-
tools/testing/selftests/riscv/sigreturn/sigreturn.c | 2 +-
tools/testing/selftests/riscv/vector/v_initval.c | 2 +-
tools/testing/selftests/riscv/vector/vstate_prctl.c | 2 +-
tools/testing/selftests/rseq/basic_percpu_ops_test.c | 2 +-
tools/testing/selftests/rseq/rseq.c | 2 +-
tools/testing/selftests/rtc/rtctest.c | 2 +-
tools/testing/selftests/seccomp/seccomp_benchmark.c | 2 +-
tools/testing/selftests/seccomp/seccomp_bpf.c | 2 +-
tools/testing/selftests/sgx/main.c | 2 +-
tools/testing/selftests/signal/mangle_uc_sigmask.c | 2 +-
tools/testing/selftests/signal/sas.c | 2 +-
tools/testing/selftests/sparc64/drivers/adi-test.c | 2 +-
tools/testing/selftests/sync/Makefile | 2 +-
tools/testing/selftests/sync/sync_test.c | 2 +-
tools/testing/selftests/sync/synctest.h | 2 +-
tools/testing/selftests/syscall_user_dispatch/sud_test.c | 2 +-
tools/testing/selftests/tdx/tdx_guest_test.c | 2 +-
tools/testing/selftests/timens/timens.h | 2 +-
tools/testing/selftests/timers/adjtick.c | 2 +-
tools/testing/selftests/timers/alarmtimer-suspend.c | 2 +-
tools/testing/selftests/timers/change_skew.c | 2 +-
tools/testing/selftests/timers/clocksource-switch.c | 2 +-
tools/testing/selftests/timers/freq-step.c | 2 +-
tools/testing/selftests/timers/inconsistency-check.c | 2 +-
tools/testing/selftests/timers/leap-a-day.c | 2 +-
tools/testing/selftests/timers/leapcrash.c | 2 +-
tools/testing/selftests/timers/mqueue-lat.c | 2 +-
tools/testing/selftests/timers/nanosleep.c | 2 +-
tools/testing/selftests/timers/nsleep-lat.c | 2 +-
tools/testing/selftests/timers/posix_timers.c | 2 +-
tools/testing/selftests/timers/raw_skew.c | 2 +-
tools/testing/selftests/timers/rtcpie.c | 2 +-
tools/testing/selftests/timers/set-2038.c | 2 +-
tools/testing/selftests/timers/set-tai.c | 2 +-
tools/testing/selftests/timers/set-timer-lat.c | 2 +-
tools/testing/selftests/timers/set-tz.c | 2 +-
tools/testing/selftests/timers/skew_consistency.c | 2 +-
tools/testing/selftests/timers/threadtest.c | 2 +-
tools/testing/selftests/timers/valid-adjtimex.c | 2 +-
tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c | 2 +-
tools/testing/selftests/tty/tty_tstamp_update.c | 2 +-
tools/testing/selftests/uevent/uevent_filtering.c | 2 +-
tools/testing/selftests/user_events/abi_test.c | 2 +-
tools/testing/selftests/user_events/dyn_test.c | 2 +-
tools/testing/selftests/user_events/ftrace_test.c | 2 +-
tools/testing/selftests/user_events/perf_test.c | 2 +-
tools/testing/selftests/user_events/user_events_selftests.h | 2 +-
tools/testing/selftests/vDSO/vdso_test_abi.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_chacha.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_clock_getres.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_correctness.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_getcpu.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_getrandom.c | 2 +-
tools/testing/selftests/vDSO/vdso_test_gettimeofday.c | 2 +-
tools/testing/selftests/x86/corrupt_xstate_header.c | 2 +-
tools/testing/selftests/x86/helpers.h | 2 +-
tools/testing/selftests/x86/lam.c | 2 +-
tools/testing/selftests/x86/syscall_numbering.c | 2 +-
tools/testing/selftests/x86/test_mremap_vdso.c | 2 +-
tools/testing/selftests/x86/test_vsyscall.c | 2 +-
tools/testing/selftests/x86/xstate.h | 2 +-
276 files changed, 278 insertions(+), 278 deletions(-)
--- a/tools/testing/selftests/acct/acct_syscall.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/acct/acct_syscall.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/alsa/conf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/conf.c
@@ -14,7 +14,7 @@
#include <regex.h>
#include <sys/stat.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "alsa-local.h"
#define SYSFS_ROOT "/sys"
--- a/tools/testing/selftests/alsa/mixer-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/mixer-test.c
@@ -25,7 +25,7 @@
#include <poll.h>
#include <stdint.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "alsa-local.h"
#define TESTS_PER_CONTROL 7
--- a/tools/testing/selftests/alsa/pcm-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/pcm-test.c
@@ -17,7 +17,7 @@
#include <assert.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "alsa-local.h"
typedef struct timespec timestamp_t;
--- a/tools/testing/selftests/alsa/test-pcmtest-driver.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/test-pcmtest-driver.c
@@ -7,7 +7,7 @@
*/
#include <string.h>
#include <alsa/asoundlib.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define CH_NUM 4
--- a/tools/testing/selftests/alsa/utimer-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/alsa/utimer-test.c
@@ -6,7 +6,7 @@
*
* Author: Ivan Orlov <ivan.orlov0322@gmail.com>
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <sound/asound.h>
#include <unistd.h>
#include <fcntl.h>
--- a/tools/testing/selftests/arm64/abi/hwcap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/abi/hwcap.c
@@ -17,7 +17,7 @@
#include <asm/sigcontext.h>
#include <asm/unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define TESTS_PER_HWCAP 3
--- a/tools/testing/selftests/arm64/abi/ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/abi/ptrace.c
@@ -18,7 +18,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define EXPECTED_TESTS 11
--- a/tools/testing/selftests/arm64/abi/syscall-abi.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/abi/syscall-abi.c
@@ -16,7 +16,7 @@
#include <asm/sigcontext.h>
#include <asm/unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "syscall-abi.h"
--- a/tools/testing/selftests/arm64/fp/fp-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/fp-ptrace.c
@@ -27,7 +27,7 @@
#include <asm/sve_context.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "fp-ptrace.h"
--- a/tools/testing/selftests/arm64/fp/fp-stress.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/fp-stress.c
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <asm/hwcap.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define MAX_VLS 16
--- a/tools/testing/selftests/arm64/fp/sve-probe-vls.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/sve-probe-vls.c
@@ -12,7 +12,7 @@
#include <sys/prctl.h>
#include <asm/sigcontext.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "rdvl.h"
int main(int argc, char **argv)
--- a/tools/testing/selftests/arm64/fp/sve-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/sve-ptrace.c
@@ -19,7 +19,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
/* <linux/elf.h> and <sys/auxv.h> don't like each other, so: */
#ifndef NT_ARM_SVE
--- a/tools/testing/selftests/arm64/fp/vec-syscfg.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/vec-syscfg.c
@@ -19,7 +19,7 @@
#include <asm/sigcontext.h>
#include <asm/hwcap.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "rdvl.h"
#define ARCH_MIN_VL SVE_VL_MIN
--- a/tools/testing/selftests/arm64/fp/za-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/za-ptrace.c
@@ -18,7 +18,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
/* <linux/elf.h> and <sys/auxv.h> don't like each other, so: */
#ifndef NT_ARM_ZA
--- a/tools/testing/selftests/arm64/fp/zt-ptrace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/fp/zt-ptrace.c
@@ -18,7 +18,7 @@
#include <asm/sigcontext.h>
#include <asm/ptrace.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
/* <linux/elf.h> and <sys/auxv.h> don't like each other, so: */
#ifndef NT_ARM_ZA
--- a/tools/testing/selftests/arm64/gcs/gcs-stress.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/gcs/gcs-stress.c
@@ -24,7 +24,7 @@
#include <sys/wait.h>
#include <asm/hwcap.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
struct child_data {
char *name, *output;
--- a/tools/testing/selftests/arm64/pauth/pac.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/pauth/pac.c
@@ -10,7 +10,7 @@
#include <setjmp.h>
#include <sched.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "helper.h"
#define PAC_COLLISION_ATTEMPTS 1000
--- a/tools/testing/selftests/arm64/tags/tags_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/arm64/tags/tags_test.c
@@ -6,7 +6,7 @@
#include <stdint.h>
#include <sys/prctl.h>
#include <sys/utsname.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define SHIFT_TAG(tag) ((uint64_t)(tag) << 56)
#define SET_TAG(ptr, tag) (((uint64_t)(ptr) & ~SHIFT_TAG(0xff)) | \
--- a/tools/testing/selftests/bpf/xskxceiver.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/bpf/xskxceiver.c
@@ -104,7 +104,7 @@
#include "xskxceiver.h"
#include <bpf/bpf.h>
#include <linux/filter.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "xsk_xdp_common.h"
#include <network_helpers.h>
--- a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/breakpoints/breakpoint_test_arm64.c
@@ -26,7 +26,7 @@
#include <errno.h>
#include <signal.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static volatile uint8_t var[96] __attribute__((__aligned__(32)));
--- a/tools/testing/selftests/breakpoints/breakpoint_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/breakpoints/breakpoint_test.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define COUNT_ISN_BPS 4
#define COUNT_WPS 4
--- a/tools/testing/selftests/breakpoints/step_after_suspend_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/breakpoints/step_after_suspend_test.c
@@ -19,7 +19,7 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
void child(int cpu)
{
--- a/tools/testing/selftests/cachestat/test_cachestat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cachestat/test_cachestat.c
@@ -16,7 +16,7 @@
#include <fcntl.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define NR_TESTS 9
--- a/tools/testing/selftests/capabilities/test_execve.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/capabilities/test_execve.c
@@ -18,7 +18,7 @@
#include <sys/prctl.h>
#include <sys/stat.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static int nerrs;
static pid_t mpid; /* main() pid is used to avoid duplicate test counts */
--- a/tools/testing/selftests/capabilities/validate_cap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/capabilities/validate_cap.c
@@ -7,7 +7,7 @@
#include <sys/prctl.h>
#include <sys/auxv.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 19)
# define HAVE_GETAUXVAL
--- a/tools/testing/selftests/cgroup/test_core.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_core.c
@@ -17,7 +17,7 @@
#include <string.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static bool nsdelegate;
--- a/tools/testing/selftests/cgroup/test_cpu.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_cpu.c
@@ -11,7 +11,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
enum hog_clock_type {
--- a/tools/testing/selftests/cgroup/test_cpuset.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_cpuset.c
@@ -3,7 +3,7 @@
#include <linux/limits.h>
#include <signal.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static int idle_process_fn(const char *cgroup, void *arg)
--- a/tools/testing/selftests/cgroup/test_freezer.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_freezer.c
@@ -11,7 +11,7 @@
#include <string.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
#define DEBUG
--- a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_hugetlb_memcg.c
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <string.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
#define ADDR ((void *)(0x0UL))
--- a/tools/testing/selftests/cgroup/test_kill.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_kill.c
@@ -9,7 +9,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "../pidfd/pidfd.h"
#include "cgroup_util.h"
--- a/tools/testing/selftests/cgroup/test_kmem.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_kmem.c
@@ -14,7 +14,7 @@
#include <sys/sysinfo.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
--- a/tools/testing/selftests/cgroup/test_memcontrol.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_memcontrol.c
@@ -18,7 +18,7 @@
#include <errno.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static bool has_localevents;
--- a/tools/testing/selftests/cgroup/test_pids.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_pids.c
@@ -9,7 +9,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static int run_success(const char *cgroup, void *arg)
--- a/tools/testing/selftests/cgroup/test_zswap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/cgroup/test_zswap.c
@@ -10,7 +10,7 @@
#include <sys/wait.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "cgroup_util.h"
static int read_int(const char *path, size_t *value)
--- a/tools/testing/selftests/clone3/clone3.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3.c
@@ -18,7 +18,7 @@
#include <unistd.h>
#include <sched.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "clone3_selftests.h"
enum test_mode {
--- a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_cap_checkpoint_restore.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <sched.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "clone3_selftests.h"
static void child_exit(int ret)
--- a/tools/testing/selftests/clone3/clone3_clear_sighand.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_clear_sighand.c
@@ -13,7 +13,7 @@
#include <sys/syscall.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "clone3_selftests.h"
static void nop_handler(int signo)
--- a/tools/testing/selftests/clone3/clone3_selftests.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_selftests.h
@@ -11,7 +11,7 @@
#include <syscall.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
--- a/tools/testing/selftests/clone3/clone3_set_tid.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/clone3/clone3_set_tid.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include <sched.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "clone3_selftests.h"
#define MAX_PID_NS_LEVEL 32
--- a/tools/testing/selftests/connector/proc_filter.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/connector/proc_filter.c
@@ -16,7 +16,7 @@
#include <signal.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define NL_MESSAGE_SIZE (sizeof(struct nlmsghdr) + sizeof(struct cn_msg) + \
sizeof(struct proc_input))
--- a/tools/testing/selftests/core/close_range_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/core/close_range_test.c
@@ -14,7 +14,7 @@
#include <sys/resource.h>
#include <linux/close_range.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../clone3/clone3_selftests.h"
--- a/tools/testing/selftests/coredump/stackdump_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/coredump/stackdump_test.c
@@ -19,7 +19,7 @@
#include <sys/un.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../filesystems/wrappers.h"
#include "../pidfd/pidfd.h"
--- a/tools/testing/selftests/core/unshare_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/core/unshare_test.c
@@ -14,7 +14,7 @@
#include <sys/resource.h>
#include <linux/close_range.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../clone3/clone3_selftests.h"
TEST(unshare_EMFILE)
--- a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c
@@ -15,7 +15,7 @@
#include <linux/dma-buf.h>
#include <linux/dma-heap.h>
#include <drm/drm.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define DEVPATH "/dev/dma_heap"
--- a/tools/testing/selftests/drivers/dma-buf/udmabuf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/drivers/dma-buf/udmabuf.c
@@ -16,7 +16,7 @@
#include <sys/mman.h>
#include <linux/memfd.h>
#include <linux/udmabuf.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define TEST_PREFIX "drivers/dma-buf/udmabuf"
#define NUM_PAGES 4
--- a/tools/testing/selftests/drivers/ntsync/ntsync.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/drivers/ntsync/ntsync.c
@@ -12,7 +12,7 @@
#include <time.h>
#include <pthread.h>
#include <linux/ntsync.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
static int read_sem_state(int sem, __u32 *count, __u32 *max)
{
--- a/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/drivers/s390x/uvdevice/test_uvdevice.c
@@ -14,7 +14,7 @@
#include <asm/uvdevice.h>
-#include "../../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define UV_PATH "/dev/uv"
#define BUFFER_SIZE 0x200
--- a/tools/testing/selftests/exec/check-exec.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/check-exec.c
@@ -30,7 +30,7 @@
#define _ASM_GENERIC_FCNTL_H
#include <linux/fcntl.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static int sys_execveat(int dirfd, const char *pathname, char *const argv[],
char *const envp[], int flags)
--- a/tools/testing/selftests/exec/execveat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/execveat.c
@@ -21,7 +21,7 @@
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TESTS_EXPECTED 54
#define TEST_NAME_LEN (PATH_MAX * 4)
--- a/tools/testing/selftests/exec/load_address.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/load_address.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct Statistics {
unsigned long long load_address;
--- a/tools/testing/selftests/exec/non-regular.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/non-regular.c
@@ -9,7 +9,7 @@
#include <sys/sysmacros.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
/* Remove a file, ignoring the result if it didn't exist. */
void rm(struct __test_metadata *_metadata, const char *pathname,
--- a/tools/testing/selftests/exec/null-argv.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/null-argv.c
@@ -5,7 +5,7 @@
#include <sys/types.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define FORK(exec) \
do { \
--- a/tools/testing/selftests/exec/recursion-depth.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/exec/recursion-depth.c
@@ -23,7 +23,7 @@
#include <fcntl.h>
#include <sys/mount.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/fchmodat2/fchmodat2_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/fchmodat2/fchmodat2_test.c
@@ -7,7 +7,7 @@
#include <syscall.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int sys_fchmodat2(int dfd, const char *filename, mode_t mode, int flags)
{
--- a/tools/testing/selftests/filelock/ofdlocks.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filelock/ofdlocks.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <unistd.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static int lock_set(int fd, struct flock *fl)
{
--- a/tools/testing/selftests/filesystems/anon_inode_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/anon_inode_test.c
@@ -6,7 +6,7 @@
#include <stdio.h>
#include <sys/stat.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "wrappers.h"
TEST(anon_inode_no_chown)
--- a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/binderfs/binderfs_test.c
@@ -21,7 +21,7 @@
#include <linux/android/binder.h>
#include <linux/android/binderfs.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define DEFAULT_THREADS 4
--- a/tools/testing/selftests/filesystems/devpts_pts.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/devpts_pts.c
@@ -11,7 +11,7 @@
#include <asm/ioctls.h>
#include <sys/mount.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static bool terminal_dup2(int duplicate, int original)
{
--- a/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/epoll/epoll_wakeup_test.c
@@ -11,7 +11,7 @@
#include <sys/epoll.h>
#include <sys/socket.h>
#include <sys/eventfd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
struct epoll_mtcontext
{
--- a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/eventfd/eventfd_test.c
@@ -11,7 +11,7 @@
#include <pthread.h>
#include <sys/epoll.h>
#include <sys/eventfd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define EVENTFD_TEST_ITERATIONS 100000UL
--- a/tools/testing/selftests/filesystems/file_stressor.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/file_stressor.c
@@ -12,7 +12,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <linux/types.h>
#include <linux/mount.h>
--- a/tools/testing/selftests/filesystems/kernfs_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/kernfs_test.c
@@ -7,7 +7,7 @@
#include <sys/stat.h>
#include <sys/xattr.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "wrappers.h"
TEST(kernfs_listxattr)
--- a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../statmount/statmount.h"
#include "../utils.h"
--- a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/mount-notify/mount-notify_test_ns.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../../pidfd/pidfd.h"
#include "../statmount/statmount.h"
#include "../utils.h"
--- a/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/nsfs/iterate_mntns.c
@@ -12,7 +12,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define MNT_NS_COUNT 11
#define MNT_NS_LAST_INDEX 10
--- a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/overlayfs/dev_in_maps.c
@@ -15,7 +15,7 @@
#include <sched.h>
#include <fcntl.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#include "log.h"
#include "../wrappers.h"
--- a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/overlayfs/set_layers_via_fds.c
@@ -12,7 +12,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../../pidfd/pidfd.h"
#include "log.h"
#include "../utils.h"
--- a/tools/testing/selftests/filesystems/statmount/listmount_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/statmount/listmount_test.c
@@ -11,7 +11,7 @@
#include <unistd.h>
#include "statmount.h"
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef LISTMOUNT_REVERSE
#define LISTMOUNT_REVERSE (1 << 0) /* List later mounts first */
--- a/tools/testing/selftests/filesystems/statmount/statmount_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/statmount/statmount_test.c
@@ -13,7 +13,7 @@
#include <linux/stat.h>
#include "statmount.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
static const char *const known_fs[] = {
"9p", "adfs", "affs", "afs", "aio", "anon_inodefs", "apparmorfs",
--- a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/statmount/statmount_test_ns.c
@@ -15,7 +15,7 @@
#include "statmount.h"
#include "../utils.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
#define NSID_PASS 0
#define NSID_FAIL 1
--- a/tools/testing/selftests/filesystems/utils.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/filesystems/utils.c
@@ -20,7 +20,7 @@
#include <sys/xattr.h>
#include <sys/mount.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "wrappers.h"
#include "utils.h"
--- a/tools/testing/selftests/hid/hid_common.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/hid/hid_common.h
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: GPL-2.0 */
/* Copyright (c) 2022-2024 Red Hat */
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <fcntl.h>
#include <fnmatch.h>
--- a/tools/testing/selftests/intel_pstate/aperf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/intel_pstate/aperf.c
@@ -11,7 +11,7 @@
#include <errno.h>
#include <string.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MSEC_PER_SEC 1000L
#define NSEC_PER_MSEC 1000000L
--- a/tools/testing/selftests/iommu/iommufd_utils.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/iommu/iommufd_utils.h
@@ -11,7 +11,7 @@
#include <assert.h>
#include <poll.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../../../../drivers/iommu/iommufd/iommufd_test.h"
/* Hack to make assertions more readable */
--- a/tools/testing/selftests/ipc/msgque.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ipc/msgque.c
@@ -7,7 +7,7 @@
#include <sys/msg.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MAX_MSG_SIZE 32
--- a/tools/testing/selftests/ir/ir_loopback.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ir/ir_loopback.c
@@ -23,7 +23,7 @@
#include <dirent.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TEST_SCANCODES 10
#define SYSFS_PATH_MAX 256
--- a/tools/testing/selftests/kcmp/kcmp_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/kcmp/kcmp_test.c
@@ -18,7 +18,7 @@
#include <sys/wait.h>
#include <sys/epoll.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static long sys_kcmp(int pid1, int pid2, int type, unsigned long fd1, unsigned long fd2)
{
--- a/tools/testing/selftests/kselftest_harness.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/kselftest_harness.h
@@ -14,7 +14,7 @@
*
* .. code-block:: c
*
- * #include "../kselftest_harness.h"
+ * #include "kselftest_harness.h"
*
* TEST(standalone_test) {
* do_some_stuff;
--- a/tools/testing/selftests/kselftest_harness/harness-selftest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/kselftest_harness/harness-selftest.c
@@ -8,7 +8,7 @@
/* Avoid any inconsistencies */
#define TH_LOG_STREAM stdout
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static void test_helper(struct __test_metadata *_metadata)
{
--- a/tools/testing/selftests/landlock/common.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/landlock/common.h
@@ -17,7 +17,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "wrappers.h"
#define TMP_DIR "tmp"
--- a/tools/testing/selftests/lsm/lsm_get_self_attr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/lsm/lsm_get_self_attr_test.c
@@ -13,7 +13,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "common.h"
static struct lsm_ctx *next_ctx(struct lsm_ctx *ctxp)
--- a/tools/testing/selftests/lsm/lsm_list_modules_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/lsm/lsm_list_modules_test.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "common.h"
TEST(size_null_lsm_list_modules)
--- a/tools/testing/selftests/lsm/lsm_set_self_attr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/lsm/lsm_set_self_attr_test.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <unistd.h>
#include <sys/types.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "common.h"
TEST(ctx_null_lsm_set_self_attr)
--- a/tools/testing/selftests/media_tests/media_device_open.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/media_tests/media_device_open.c
@@ -34,7 +34,7 @@
#include <sys/stat.h>
#include <linux/media.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/media_tests/media_device_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/media_tests/media_device_test.c
@@ -39,7 +39,7 @@
#include <time.h>
#include <linux/media.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/membarrier/membarrier_test_impl.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/membarrier/membarrier_test_impl.h
@@ -7,7 +7,7 @@
#include <string.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static int registrations;
--- a/tools/testing/selftests/mincore/mincore_selftest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mincore/mincore_selftest.c
@@ -15,8 +15,8 @@
#include <string.h>
#include <fcntl.h>
-#include "../kselftest.h"
-#include "../kselftest_harness.h"
+#include "kselftest.h"
+#include "kselftest_harness.h"
/* Default test file size: 4MB */
#define MB (1UL << 20)
--- a/tools/testing/selftests/mm/compaction_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/compaction_test.c
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MAP_SIZE_MB 100
#define MAP_SIZE (MAP_SIZE_MB * 1024 * 1024)
--- a/tools/testing/selftests/mm/cow.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/cow.c
@@ -27,7 +27,7 @@
#endif /* LOCAL_CONFIG_HAVE_LIBURING */
#include "../../../../mm/gup_test.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#include "thp_settings.h"
--- a/tools/testing/selftests/mm/droppable.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/droppable.c
@@ -13,7 +13,7 @@
#include <sys/mman.h>
#include <linux/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char *argv[])
{
--- a/tools/testing/selftests/mm/guard-regions.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/guard-regions.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <asm-generic/mman.h> /* Force the import of the tools version. */
#include <assert.h>
#include <errno.h>
--- a/tools/testing/selftests/mm/gup_longterm.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/gup_longterm.c
@@ -27,7 +27,7 @@
#endif /* LOCAL_CONFIG_HAVE_LIBURING */
#include "../../../../mm/gup_test.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
static size_t pagesize;
--- a/tools/testing/selftests/mm/gup_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/gup_test.c
@@ -12,7 +12,7 @@
#include <pthread.h>
#include <assert.h>
#include <mm/gup_test.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define MB (1UL << 20)
--- a/tools/testing/selftests/mm/hmm-tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hmm-tests.c
@@ -10,7 +10,7 @@
* bugs.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <errno.h>
#include <fcntl.h>
--- a/tools/testing/selftests/mm/hugepage-mmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugepage-mmap.c
@@ -15,7 +15,7 @@
#include <unistd.h>
#include <sys/mman.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define LENGTH (256UL*1024*1024)
#define PROTECTION (PROT_READ | PROT_WRITE)
--- a/tools/testing/selftests/mm/hugepage-mremap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugepage-mremap.c
@@ -24,7 +24,7 @@
#include <sys/ioctl.h>
#include <string.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define DEFAULT_LENGTH_MB 10UL
--- a/tools/testing/selftests/mm/hugetlb_dio.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb_dio.c
@@ -18,7 +18,7 @@
#include <string.h>
#include <sys/mman.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
void run_dio_using_hugetlb(unsigned int start_off, unsigned int end_off)
{
--- a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb_fault_after_madv.c
@@ -9,7 +9,7 @@
#include <signal.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define INLOOP_ITER 100
--- a/tools/testing/selftests/mm/hugetlb-madvise.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb-madvise.c
@@ -19,7 +19,7 @@
#include <sys/mman.h>
#include <fcntl.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define MIN_FREE_PAGES 20
#define NR_HUGE_PAGES 10 /* common number of pages to map/allocate */
--- a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb_madv_vs_map.c
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define INLOOP_ITER 100
--- a/tools/testing/selftests/mm/hugetlb-read-hwpoison.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb-read-hwpoison.c
@@ -11,7 +11,7 @@
#include <errno.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define PREFIX " ... "
#define ERROR_PREFIX " !!! "
--- a/tools/testing/selftests/mm/hugetlb-soft-offline.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/hugetlb-soft-offline.c
@@ -24,7 +24,7 @@
#include <sys/statfs.h>
#include <sys/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef MADV_SOFT_OFFLINE
#define MADV_SOFT_OFFLINE 101
--- a/tools/testing/selftests/mm/ksm_functional_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/ksm_functional_tests.c
@@ -21,7 +21,7 @@
#include <sys/wait.h>
#include <linux/userfaultfd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define KiB 1024u
--- a/tools/testing/selftests/mm/ksm_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/ksm_tests.c
@@ -12,7 +12,7 @@
#include <stdint.h>
#include <err.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include <include/vdso/time64.h>
#include "vm_util.h"
#include "thp_settings.h"
--- a/tools/testing/selftests/mm/madv_populate.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/madv_populate.c
@@ -17,7 +17,7 @@
#include <linux/mman.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
/*
--- a/tools/testing/selftests/mm/map_fixed_noreplace.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/map_fixed_noreplace.c
@@ -12,7 +12,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static void dump_maps(void)
{
--- a/tools/testing/selftests/mm/map_hugetlb.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/map_hugetlb.c
@@ -11,7 +11,7 @@
#include <sys/mman.h>
#include <fcntl.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define LENGTH (256UL*1024*1024)
#define PROTECTION (PROT_READ | PROT_WRITE)
--- a/tools/testing/selftests/mm/map_populate.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/map_populate.c
@@ -16,7 +16,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
--- a/tools/testing/selftests/mm/mdwe_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mdwe_test.c
@@ -14,7 +14,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef __aarch64__
# define PROT_BTI 0
--- a/tools/testing/selftests/mm/memfd_secret.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/memfd_secret.c
@@ -22,7 +22,7 @@
#include <stdio.h>
#include <fcntl.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define fail(fmt, ...) ksft_test_result_fail(fmt, ##__VA_ARGS__)
#define pass(fmt, ...) ksft_test_result_pass(fmt, ##__VA_ARGS__)
--- a/tools/testing/selftests/mm/merge.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/merge.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <linux/prctl.h>
#include <fcntl.h>
#include <stdio.h>
--- a/tools/testing/selftests/mm/migration.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/migration.c
@@ -4,7 +4,7 @@
* paths in the kernel.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "thp_settings.h"
#include <strings.h>
--- a/tools/testing/selftests/mm/mkdirty.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mkdirty.c
@@ -22,7 +22,7 @@
#include <linux/userfaultfd.h>
#include <linux/mempolicy.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
static size_t pagesize;
--- a/tools/testing/selftests/mm/mlock2-tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mlock2-tests.c
@@ -7,7 +7,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "mlock2.h"
struct vm_boundaries {
--- a/tools/testing/selftests/mm/mlock-random-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mlock-random-test.c
@@ -13,7 +13,7 @@
#include <sys/ipc.h>
#include <sys/shm.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "mlock2.h"
#define CHUNK_UNIT (128 * 1024)
--- a/tools/testing/selftests/mm/mrelease_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mrelease_test.c
@@ -12,7 +12,7 @@
#include <unistd.h>
#include <asm-generic/unistd.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define MB(x) (x << 20)
#define MAX_SIZE_MB 1024
--- a/tools/testing/selftests/mm/mremap_dontunmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mremap_dontunmap.c
@@ -14,7 +14,7 @@
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
unsigned long page_size;
char *page_buffer;
--- a/tools/testing/selftests/mm/mremap_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mremap_test.c
@@ -16,7 +16,7 @@
#include <time.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define EXPECT_SUCCESS 0
#define EXPECT_FAILURE 1
--- a/tools/testing/selftests/mm/mseal_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/mseal_test.c
@@ -8,7 +8,7 @@
#include <sys/time.h>
#include <sys/resource.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include <syscall.h>
#include <errno.h>
#include <stdio.h>
--- a/tools/testing/selftests/mm/on-fault-limit.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/on-fault-limit.c
@@ -5,7 +5,7 @@
#include <string.h>
#include <sys/time.h>
#include <sys/resource.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static void test_limit(void)
{
--- a/tools/testing/selftests/mm/pagemap_ioctl.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/pagemap_ioctl.c
@@ -8,7 +8,7 @@
#include <errno.h>
#include <malloc.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#include <linux/types.h>
#include <linux/memfd.h>
#include <linux/userfaultfd.h>
--- a/tools/testing/selftests/mm/pfnmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/pfnmap.c
@@ -21,7 +21,7 @@
#include <sys/mman.h>
#include <sys/wait.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "vm_util.h"
static sigjmp_buf sigjmp_buf_env;
--- a/tools/testing/selftests/mm/pkey-helpers.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/pkey-helpers.h
@@ -16,7 +16,7 @@
#include <linux/mman.h>
#include <linux/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* Define some kernel-like types */
typedef __u8 u8;
--- a/tools/testing/selftests/mm/process_madv.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/process_madv.c
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-or-later
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <errno.h>
#include <setjmp.h>
#include <signal.h>
--- a/tools/testing/selftests/mm/soft-dirty.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/soft-dirty.c
@@ -7,7 +7,7 @@
#include <malloc.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#include "thp_settings.h"
--- a/tools/testing/selftests/mm/split_huge_page_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/split_huge_page_test.c
@@ -20,7 +20,7 @@
#include <stdbool.h>
#include <time.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
uint64_t pagesize;
unsigned int pageshift;
--- a/tools/testing/selftests/mm/thuge-gen.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/thuge-gen.c
@@ -27,7 +27,7 @@
#include <stdarg.h>
#include <string.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#if !defined(MAP_HUGETLB)
#define MAP_HUGETLB 0x40000
--- a/tools/testing/selftests/mm/transhuge-stress.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/transhuge-stress.c
@@ -16,7 +16,7 @@
#include <string.h>
#include <sys/mman.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
int backing_fd = -1;
int mmap_flags = MAP_ANONYMOUS | MAP_NORESERVE | MAP_PRIVATE;
--- a/tools/testing/selftests/mm/uffd-common.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/uffd-common.h
@@ -35,7 +35,7 @@
#include <sys/random.h>
#include <stdatomic.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define UFFD_FLAGS (O_CLOEXEC | O_NONBLOCK | UFFD_USER_MODE_ONLY)
--- a/tools/testing/selftests/mm/uffd-wp-mremap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/uffd-wp-mremap.c
@@ -7,7 +7,7 @@
#include <assert.h>
#include <linux/mman.h>
#include <sys/mman.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "thp_settings.h"
#include "uffd-common.h"
--- a/tools/testing/selftests/mm/va_high_addr_switch.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/va_high_addr_switch.c
@@ -10,7 +10,7 @@
#include <string.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
/*
* The hint addr value is used to allocate addresses
--- a/tools/testing/selftests/mm/virtual_address_range.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/virtual_address_range.c
@@ -16,7 +16,7 @@
#include <fcntl.h>
#include "vm_util.h"
-#include "../kselftest.h"
+#include "kselftest.h"
/*
* Maximum address range mapped with a single mmap()
--- a/tools/testing/selftests/mm/vm_util.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/vm_util.c
@@ -9,7 +9,7 @@
#include <linux/fs.h>
#include <sys/syscall.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vm_util.h"
#define PMD_SIZE_FILE_PATH "/sys/kernel/mm/transparent_hugepage/hpage_pmd_size"
--- a/tools/testing/selftests/mm/vm_util.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mm/vm_util.h
@@ -6,7 +6,7 @@
#include <stdarg.h>
#include <strings.h> /* ffsl() */
#include <unistd.h> /* _SC_PAGESIZE */
-#include "../kselftest.h"
+#include "kselftest.h"
#include <linux/fs.h>
#define BIT_ULL(nr) (1ULL << (nr))
--- a/tools/testing/selftests/mount_setattr/mount_setattr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mount_setattr/mount_setattr_test.c
@@ -21,7 +21,7 @@
#include <linux/mount.h>
#include "../filesystems/wrappers.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef CLONE_NEWNS
#define CLONE_NEWNS 0x00020000
--- a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/move_mount_set_group/move_mount_set_group_test.c
@@ -15,7 +15,7 @@
#include <stdarg.h>
#include <sys/syscall.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef CLONE_NEWNS
#define CLONE_NEWNS 0x00020000
--- a/tools/testing/selftests/mqueue/mq_open_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mqueue/mq_open_tests.c
@@ -33,7 +33,7 @@
#include <mqueue.h>
#include <error.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static char *usage =
"Usage:\n"
--- a/tools/testing/selftests/mqueue/mq_perf_tests.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mqueue/mq_perf_tests.c
@@ -40,7 +40,7 @@
#include <popt.h>
#include <error.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static char *usage =
"Usage:\n"
--- a/tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/mseal_system_mappings/sysmap_is_sealed.c
@@ -11,8 +11,8 @@
#include <string.h>
#include <stdbool.h>
-#include "../kselftest.h"
-#include "../kselftest_harness.h"
+#include "kselftest.h"
+#include "kselftest_harness.h"
#define VMFLAGS "VmFlags:"
#define MSEAL_FLAGS "sl"
--- a/tools/testing/selftests/nci/nci_dev.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/nci/nci_dev.c
@@ -16,7 +16,7 @@
#include <sys/socket.h>
#include <linux/nfc.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define GENLMSG_DATA(glh) ((void *)(NLMSG_DATA(glh) + GENL_HDRLEN))
#define GENLMSG_PAYLOAD(glh) (NLMSG_PAYLOAD(glh, 0) - GENL_HDRLEN)
--- a/tools/testing/selftests/net/af_unix/diag_uid.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/diag_uid.c
@@ -14,7 +14,7 @@
#include <sys/types.h>
#include <sys/un.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(diag_uid)
{
--- a/tools/testing/selftests/net/af_unix/msg_oob.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/msg_oob.c
@@ -11,7 +11,7 @@
#include <sys/signalfd.h>
#include <sys/socket.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define BUF_SZ 32
--- a/tools/testing/selftests/net/af_unix/scm_inq.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/scm_inq.c
@@ -6,7 +6,7 @@
#include <sys/socket.h>
#include <sys/types.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define NR_CHUNKS 100
#define MSG_LEN 256
--- a/tools/testing/selftests/net/af_unix/scm_pidfd.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/scm_pidfd.c
@@ -16,7 +16,7 @@
#include <sys/wait.h>
#include "../../pidfd/pidfd.h"
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define clean_errno() (errno == 0 ? "None" : strerror(errno))
#define log_err(MSG, ...) \
--- a/tools/testing/selftests/net/af_unix/scm_rights.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/scm_rights.c
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(scm_rights)
{
--- a/tools/testing/selftests/net/af_unix/unix_connect.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/af_unix/unix_connect.c
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/un.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(unix_connect)
{
--- a/tools/testing/selftests/net/bind_timewait.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/bind_timewait.c
@@ -4,7 +4,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(bind_timewait)
{
--- a/tools/testing/selftests/net/bind_wildcard.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/bind_wildcard.c
@@ -4,7 +4,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const __u32 in4addr_any = INADDR_ANY;
static const __u32 in4addr_loopback = INADDR_LOOPBACK;
--- a/tools/testing/selftests/net/can/test_raw_filter.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/can/test_raw_filter.c
@@ -19,7 +19,7 @@
#include <linux/can.h>
#include <linux/can/raw.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define ID 0x123
--- a/tools/testing/selftests/net/cmsg_sender.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/cmsg_sender.c
@@ -16,7 +16,7 @@
#include <linux/udp.h>
#include <sys/socket.h>
-#include "../kselftest.h"
+#include "kselftest.h"
enum {
ERN_SUCCESS = 0,
--- a/tools/testing/selftests/net/epoll_busy_poll.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/epoll_busy_poll.c
@@ -23,7 +23,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
/* if the headers haven't been updated, we need to define some things */
#if !defined(EPOLL_IOC_TYPE)
--- a/tools/testing/selftests/net/gro.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/gro.c
@@ -57,7 +57,7 @@
#include <string.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define DPORT 8000
#define SPORT 1500
--- a/tools/testing/selftests/net/ip_local_port_range.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/ip_local_port_range.c
@@ -10,7 +10,7 @@
#include <fcntl.h>
#include <netinet/ip.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef IP_LOCAL_PORT_RANGE
#define IP_LOCAL_PORT_RANGE 51
--- a/tools/testing/selftests/net/ipsec.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/ipsec.c
@@ -34,7 +34,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define printk(fmt, ...) \
ksft_print_msg("%d[%u] " fmt "\n", getpid(), __LINE__, ##__VA_ARGS__)
--- a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/netfilter/conntrack_dump_flush.c
@@ -10,7 +10,7 @@
#include <linux/netfilter/nfnetlink.h>
#include <linux/netfilter/nfnetlink_conntrack.h>
#include <linux/netfilter/nf_conntrack_tcp.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TEST_ZONE_ID 123
#define NF_CT_DEFAULT_ZONE_ID 0
--- a/tools/testing/selftests/net/netlink-dumps.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/netlink-dumps.c
@@ -18,7 +18,7 @@
#include <linux/mqueue.h>
#include <linux/rtnetlink.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <ynl.h>
--- a/tools/testing/selftests/net/proc_net_pktgen.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/proc_net_pktgen.c
@@ -10,7 +10,7 @@
#include <stdlib.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const char ctrl_cmd_stop[] = "stop";
static const char ctrl_cmd_start[] = "start";
--- a/tools/testing/selftests/net/psock_fanout.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/psock_fanout.c
@@ -54,7 +54,7 @@
#include <unistd.h>
#include "psock_lib.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define RING_NUM_FRAMES 20
--- a/tools/testing/selftests/net/psock_tpacket.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/psock_tpacket.c
@@ -46,7 +46,7 @@
#include "psock_lib.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef bug_on
# define bug_on(cond) assert(!(cond))
--- a/tools/testing/selftests/net/reuseaddr_ports_exhausted.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/reuseaddr_ports_exhausted.c
@@ -22,7 +22,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
struct reuse_opts {
int reuseaddr[2];
--- a/tools/testing/selftests/net/reuseport_bpf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/reuseport_bpf.c
@@ -24,7 +24,7 @@
#include <sys/resource.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct test_params {
int recv_family;
--- a/tools/testing/selftests/net/reuseport_bpf_numa.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/reuseport_bpf_numa.c
@@ -23,7 +23,7 @@
#include <unistd.h>
#include <numa.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static const int PORT = 8888;
--- a/tools/testing/selftests/net/rxtimestamp.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/rxtimestamp.c
@@ -18,7 +18,7 @@
#include <linux/net_tstamp.h>
#include <linux/errqueue.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct options {
int so_timestamp;
--- a/tools/testing/selftests/net/sk_so_peek_off.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/sk_so_peek_off.c
@@ -8,7 +8,7 @@
#include <sys/types.h>
#include <netinet/in.h>
#include <arpa/inet.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static char *afstr(int af, int proto)
{
--- a/tools/testing/selftests/net/socket.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/socket.c
@@ -7,7 +7,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
-#include "../kselftest.h"
+#include "kselftest.h"
struct socket_testcase {
int domain;
--- a/tools/testing/selftests/net/so_incoming_cpu.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/so_incoming_cpu.c
@@ -9,7 +9,7 @@
#include <sys/socket.h>
#include <sys/sysinfo.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(so_incoming_cpu)
{
--- a/tools/testing/selftests/net/tap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tap.c
@@ -17,7 +17,7 @@
#include <linux/virtio_net.h>
#include <netinet/ip.h>
#include <netinet/udp.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static const char param_dev_tap_name[] = "xmacvtap0";
static const char param_dev_dummy_name[] = "xdummy0";
--- a/tools/testing/selftests/net/tcp_ao/lib/setup.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tcp_ao/lib/setup.c
@@ -9,7 +9,7 @@
* Can't be included in the header: it defines static variables which
* will be unique to every object. Let's include it only once here.
*/
-#include "../../../kselftest.h"
+#include "kselftest.h"
/* Prevent overriding of one thread's output by another */
static pthread_mutex_t ksft_print_lock = PTHREAD_MUTEX_INITIALIZER;
--- a/tools/testing/selftests/net/tcp_fastopen_backup_key.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tcp_fastopen_backup_key.c
@@ -26,7 +26,7 @@
#include <fcntl.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef TCP_FASTOPEN_KEY
#define TCP_FASTOPEN_KEY 33
--- a/tools/testing/selftests/net/tls.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tls.c
@@ -21,7 +21,7 @@
#include <sys/socket.h>
#include <sys/stat.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TLS_PAYLOAD_MAX_LEN 16384
#define SOL_TLS 282
--- a/tools/testing/selftests/net/toeplitz.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/toeplitz.c
@@ -52,7 +52,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TOEPLITZ_KEY_MIN_LEN 40
#define TOEPLITZ_KEY_MAX_LEN 60
--- a/tools/testing/selftests/net/tun.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/tun.c
@@ -15,7 +15,7 @@
#include <sys/ioctl.h>
#include <sys/socket.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static int tun_attach(int fd, char *dev)
{
--- a/tools/testing/selftests/net/udpgso_bench_tx.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/net/udpgso_bench_tx.c
@@ -25,7 +25,7 @@
#include <sys/types.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef ETH_MAX_MTU
#define ETH_MAX_MTU 0xFFFFU
--- a/tools/testing/selftests/openat2/helpers.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/helpers.h
@@ -12,7 +12,7 @@
#include <stdbool.h>
#include <errno.h>
#include <linux/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ARRAY_LEN(X) (sizeof (X) / sizeof (*(X)))
#define BUILD_BUG_ON(e) ((void)(sizeof(struct { int:(-!!(e)); })))
--- a/tools/testing/selftests/openat2/openat2_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/openat2_test.c
@@ -15,7 +15,7 @@
#include <stdbool.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "helpers.h"
/*
--- a/tools/testing/selftests/openat2/rename_attack_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/rename_attack_test.c
@@ -22,7 +22,7 @@
#include <limits.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "helpers.h"
/* Construct a test directory with the following structure:
--- a/tools/testing/selftests/openat2/resolve_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/openat2/resolve_test.c
@@ -14,7 +14,7 @@
#include <stdbool.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "helpers.h"
/*
--- a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pci_endpoint/pci_endpoint_test.c
@@ -20,7 +20,7 @@
#include "../../../../include/uapi/linux/pcitest.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define pci_ep_ioctl(cmd, arg) \
({ \
--- a/tools/testing/selftests/perf_events/mmap.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/mmap.c
@@ -14,7 +14,7 @@
#include <linux/perf_event.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define RB_SIZE 0x3000
#define AUX_SIZE 0x10000
--- a/tools/testing/selftests/perf_events/remove_on_exec.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/remove_on_exec.c
@@ -30,7 +30,7 @@
#include <sys/syscall.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
static volatile int signal_count;
--- a/tools/testing/selftests/perf_events/sigtrap_threads.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/perf_events/sigtrap_threads.c
@@ -31,7 +31,7 @@
#include <sys/syscall.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define NUM_THREADS 5
--- a/tools/testing/selftests/pidfd/pidfd_bind_mount.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_bind_mount.c
@@ -14,7 +14,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../filesystems/wrappers.h"
FIXTURE(pidfd_bind_mount) {
--- a/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_fdinfo_test.c
@@ -16,7 +16,7 @@
#include <sys/mount.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
struct error {
int code;
--- a/tools/testing/selftests/pidfd/pidfd_file_handle_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_file_handle_test.c
@@ -20,7 +20,7 @@
#include <sys/stat.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(file_handle)
{
--- a/tools/testing/selftests/pidfd/pidfd_getfd_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_getfd_test.c
@@ -19,7 +19,7 @@
#include <linux/kcmp.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
/*
* UNKNOWN_FD is an fd number that should never exist in the child, as it is
--- a/tools/testing/selftests/pidfd/pidfd.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd.h
@@ -25,7 +25,7 @@
#undef SCHED_FLAG_KEEP_ALL
#undef SCHED_FLAG_UTIL_CLAMP
-#include "../kselftest.h"
+#include "kselftest.h"
#include "../clone3/clone3_selftests.h"
#ifndef FD_PIDFS_ROOT
--- a/tools/testing/selftests/pidfd/pidfd_info_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_info_test.c
@@ -21,7 +21,7 @@
#include <sys/stat.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(pidfd_info)
{
--- a/tools/testing/selftests/pidfd/pidfd_open_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_open_test.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
static int safe_int(const char *numstr, int *converted)
{
--- a/tools/testing/selftests/pidfd/pidfd_poll_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_poll_test.c
@@ -14,7 +14,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
static bool timeout;
--- a/tools/testing/selftests/pidfd/pidfd_setattr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_setattr_test.c
@@ -22,7 +22,7 @@
#include <sys/xattr.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(pidfs_setattr)
{
--- a/tools/testing/selftests/pidfd/pidfd_setns_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_setns_test.c
@@ -18,7 +18,7 @@
#include <sys/stat.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
enum {
PIDFD_NS_USER,
--- a/tools/testing/selftests/pidfd/pidfd_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_test.c
@@ -20,7 +20,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#define str(s) _str(s)
#define _str(s) #s
--- a/tools/testing/selftests/pidfd/pidfd_wait.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_wait.c
@@ -17,7 +17,7 @@
#include <unistd.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define ptr_to_u64(ptr) ((__u64)((uintptr_t)(ptr)))
--- a/tools/testing/selftests/pidfd/pidfd_xattr_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pidfd/pidfd_xattr_test.c
@@ -22,7 +22,7 @@
#include <sys/xattr.h>
#include "pidfd.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
FIXTURE(pidfs_xattr)
{
--- a/tools/testing/selftests/pid_namespace/pid_max.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pid_namespace/pid_max.c
@@ -13,7 +13,7 @@
#include <sys/mount.h>
#include <sys/wait.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../pidfd/pidfd.h"
#define __STACK_SIZE (8 * 1024 * 1024)
--- a/tools/testing/selftests/pid_namespace/regression_enomem.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/pid_namespace/regression_enomem.c
@@ -11,7 +11,7 @@
#include <syscall.h>
#include <sys/wait.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../pidfd/pidfd.h"
/*
--- a/tools/testing/selftests/prctl/set-anon-vma-name-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/prctl/set-anon-vma-name-test.c
@@ -10,7 +10,7 @@
#include <sys/mman.h>
#include <string.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define AREA_SIZE 1024
--- a/tools/testing/selftests/prctl/set-process-name.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/prctl/set-process-name.c
@@ -7,7 +7,7 @@
#include <sys/prctl.h>
#include <string.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define CHANGE_NAME "changename"
#define EMPTY_NAME ""
--- a/tools/testing/selftests/proc/proc-maps-race.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/proc/proc-maps-race.c
@@ -23,7 +23,7 @@
*
*/
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <errno.h>
#include <fcntl.h>
#include <pthread.h>
--- a/tools/testing/selftests/proc/proc-pid-vm.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/proc/proc-pid-vm.c
@@ -51,7 +51,7 @@
#define __maybe_unused __attribute__((__unused__))
#endif
-#include "../kselftest.h"
+#include "kselftest.h"
static inline long sys_execveat(int dirfd, const char *pathname, char **argv, char **envp, int flags)
{
--- a/tools/testing/selftests/ptrace/get_set_sud.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/get_set_sud.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0
#define _GNU_SOURCE
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <stdio.h>
#include <string.h>
#include <errno.h>
--- a/tools/testing/selftests/ptrace/get_syscall_info.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/get_syscall_info.c
@@ -7,7 +7,7 @@
* matches userspace expectations.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <err.h>
#include <signal.h>
#include <asm/unistd.h>
--- a/tools/testing/selftests/ptrace/set_syscall_info.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/set_syscall_info.c
@@ -7,7 +7,7 @@
* matches userspace expectations.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <err.h>
#include <fcntl.h>
#include <signal.h>
--- a/tools/testing/selftests/ptrace/vmaccess.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ptrace/vmaccess.c
@@ -7,7 +7,7 @@
* when de_thread is blocked with ->cred_guard_mutex held.
*/
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include <stdio.h>
#include <fcntl.h>
#include <pthread.h>
--- a/tools/testing/selftests/resctrl/resctrl.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/resctrl/resctrl.h
@@ -23,7 +23,7 @@
#include <asm/unistd.h>
#include <linux/perf_event.h>
#include <linux/compiler.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MB (1024 * 1024)
#define RESCTRL_PATH "/sys/fs/resctrl"
--- a/tools/testing/selftests/ring-buffer/map_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/ring-buffer/map_test.c
@@ -17,7 +17,7 @@
#include <sys/ioctl.h>
#include "../user_events/user_events_selftests.h" /* share tracefs setup */
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TRACEFS_ROOT "/sys/kernel/tracing"
--- a/tools/testing/selftests/riscv/abi/pointer_masking.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/abi/pointer_masking.c
@@ -9,7 +9,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#ifndef PR_PMLEN_SHIFT
#define PR_PMLEN_SHIFT 24
--- a/tools/testing/selftests/riscv/hwprobe/cbo.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/hwprobe/cbo.c
@@ -17,7 +17,7 @@
#include <asm/ucontext.h>
#include "hwprobe.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
#define MK_CBO(fn) le32_bswap((uint32_t)(fn) << 20 | 10 << 15 | 2 << 12 | 0 << 7 | 15)
--- a/tools/testing/selftests/riscv/hwprobe/hwprobe.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/hwprobe/hwprobe.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
#include "hwprobe.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/riscv/hwprobe/which-cpus.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/hwprobe/which-cpus.c
@@ -14,7 +14,7 @@
#include <assert.h>
#include "hwprobe.h"
-#include "../../kselftest.h"
+#include "kselftest.h"
static void help(void)
{
--- a/tools/testing/selftests/riscv/mm/mmap_bottomup.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/mm/mmap_bottomup.c
@@ -2,7 +2,7 @@
#include <sys/mman.h>
#include <mmap_test.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
TEST(infinite_rlimit)
{
--- a/tools/testing/selftests/riscv/mm/mmap_default.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/mm/mmap_default.c
@@ -2,7 +2,7 @@
#include <sys/mman.h>
#include <mmap_test.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
TEST(default_rlimit)
{
--- a/tools/testing/selftests/riscv/mm/mmap_test.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/mm/mmap_test.h
@@ -5,7 +5,7 @@
#include <sys/resource.h>
#include <stddef.h>
#include <strings.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TOP_DOWN 0
#define BOTTOM_UP 1
--- a/tools/testing/selftests/riscv/sigreturn/sigreturn.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/sigreturn/sigreturn.c
@@ -4,7 +4,7 @@
#include <stdlib.h>
#include <ucontext.h>
#include <linux/ptrace.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#define RISCV_V_MAGIC 0x53465457
#define DEFAULT_VALUE 2
--- a/tools/testing/selftests/riscv/vector/v_initval.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/vector/v_initval.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "v_helpers.h"
#define NEXT_PROGRAM "./v_exec_initval_nolibc"
--- a/tools/testing/selftests/riscv/vector/vstate_prctl.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/riscv/vector/vstate_prctl.c
@@ -6,7 +6,7 @@
#include <sys/types.h>
#include <stdlib.h>
-#include "../../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "v_helpers.h"
#define NEXT_PROGRAM "./vstate_exec_nolibc"
--- a/tools/testing/selftests/rseq/basic_percpu_ops_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/rseq/basic_percpu_ops_test.c
@@ -9,7 +9,7 @@
#include <string.h>
#include <stddef.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "rseq.h"
#ifdef BUILDOPT_RSEQ_PERCPU_MM_CID
--- a/tools/testing/selftests/rseq/rseq.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/rseq/rseq.c
@@ -33,7 +33,7 @@
#include <linux/compiler.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "rseq.h"
/*
--- a/tools/testing/selftests/rtc/rtctest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/rtc/rtctest.c
@@ -16,7 +16,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define NUM_UIE 3
#define ALARM_DELTA 3
--- a/tools/testing/selftests/seccomp/seccomp_benchmark.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/seccomp/seccomp_benchmark.c
@@ -20,7 +20,7 @@
#include <sys/syscall.h>
#include <sys/types.h>
-#include "../kselftest.h"
+#include "kselftest.h"
unsigned long long timing(clockid_t clk_id, unsigned long long samples)
{
--- a/tools/testing/selftests/seccomp/seccomp_bpf.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/seccomp/seccomp_bpf.c
@@ -53,7 +53,7 @@
#include <sys/syscall.h>
#include <poll.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "../clone3/clone3_selftests.h"
/* Attempt to de-conflict with the selftests tree. */
--- a/tools/testing/selftests/sgx/main.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sgx/main.c
@@ -18,7 +18,7 @@
#include <sys/types.h>
#include <sys/auxv.h>
#include "defines.h"
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "main.h"
static const uint64_t MAGIC = 0x1122334455667788ULL;
--- a/tools/testing/selftests/signal/mangle_uc_sigmask.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/signal/mangle_uc_sigmask.c
@@ -39,7 +39,7 @@
#include <signal.h>
#include <ucontext.h>
-#include "../kselftest.h"
+#include "kselftest.h"
void handler_verify_ucontext(int signo, siginfo_t *info, void *uc)
{
--- a/tools/testing/selftests/signal/sas.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/signal/sas.c
@@ -19,7 +19,7 @@
#include <errno.h>
#include <sys/auxv.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "current_stack_pointer.h"
#ifndef SS_AUTODISARM
--- a/tools/testing/selftests/sparc64/drivers/adi-test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sparc64/drivers/adi-test.c
@@ -16,7 +16,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../../kselftest.h"
+#include "kselftest.h"
#define DEBUG_LEVEL_1_BIT (0x0001)
#define DEBUG_LEVEL_2_BIT (0x0002)
--- a/tools/testing/selftests/sync/Makefile~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sync/Makefile
@@ -33,6 +33,6 @@ $(OBJS): $(OUTPUT)/%.o: %.c
$(CC) -c $^ -o $@ $(CFLAGS)
$(TESTS): $(OUTPUT)/%.o: %.c
- $(CC) -c $^ -o $@
+ $(CC) -c $^ -o $@ $(CFLAGS)
EXTRA_CLEAN := $(TEST_CUSTOM_PROGS) $(OBJS) $(TESTS)
--- a/tools/testing/selftests/sync/sync_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sync/sync_test.c
@@ -34,7 +34,7 @@
#include <errno.h>
#include <string.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "synctest.h"
static int run_test(int (*test)(void), char *name)
--- a/tools/testing/selftests/sync/synctest.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/sync/synctest.h
@@ -29,7 +29,7 @@
#define SELFTESTS_SYNCTEST_H
#include <stdio.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ASSERT(cond, msg) do { \
if (!(cond)) { \
--- a/tools/testing/selftests/syscall_user_dispatch/sud_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/syscall_user_dispatch/sud_test.c
@@ -14,7 +14,7 @@
#include <stdlib.h>
#include <asm/unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#ifndef PR_SET_SYSCALL_USER_DISPATCH
# define PR_SET_SYSCALL_USER_DISPATCH 59
--- a/tools/testing/selftests/tdx/tdx_guest_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/tdx/tdx_guest_test.c
@@ -13,7 +13,7 @@
#include <fcntl.h>
#include <linux/tdx-guest.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define TDX_GUEST_DEVNAME "/dev/tdx_guest"
#define HEX_DUMP_SIZE 8
--- a/tools/testing/selftests/timens/timens.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timens/timens.h
@@ -7,7 +7,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef CLONE_NEWTIME
# define CLONE_NEWTIME 0x00000080
--- a/tools/testing/selftests/timers/adjtick.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/adjtick.c
@@ -24,7 +24,7 @@
#include <time.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MILLION 1000000
--- a/tools/testing/selftests/timers/alarmtimer-suspend.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/alarmtimer-suspend.c
@@ -30,7 +30,7 @@
#include <pthread.h>
#include <include/vdso/time64.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define UNREASONABLE_LAT (NSEC_PER_SEC * 5) /* hopefully we resume in 5 secs */
--- a/tools/testing/selftests/timers/change_skew.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/change_skew.c
@@ -28,7 +28,7 @@
#include <sys/time.h>
#include <sys/timex.h>
#include <time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int change_skew_test(int ppm)
{
--- a/tools/testing/selftests/timers/clocksource-switch.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/clocksource-switch.c
@@ -34,7 +34,7 @@
#include <sys/wait.h>
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int get_clocksources(char list[][30])
--- a/tools/testing/selftests/timers/freq-step.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/freq-step.c
@@ -15,7 +15,7 @@
#include <time.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define SAMPLES 100
#define SAMPLE_READINGS 10
--- a/tools/testing/selftests/timers/inconsistency-check.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/inconsistency-check.c
@@ -29,7 +29,7 @@
#include <string.h>
#include <signal.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
#define CLOCK_HWSPECIFIC 10
--- a/tools/testing/selftests/timers/leap-a-day.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/leap-a-day.c
@@ -49,7 +49,7 @@
#include <signal.h>
#include <unistd.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define CLOCK_TAI 11
--- a/tools/testing/selftests/timers/leapcrash.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/leapcrash.c
@@ -22,7 +22,7 @@
#include <sys/timex.h>
#include <string.h>
#include <signal.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* clear NTP time_status & time_state */
int clear_time_state(void)
--- a/tools/testing/selftests/timers/mqueue-lat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/mqueue-lat.c
@@ -30,7 +30,7 @@
#include <errno.h>
#include <mqueue.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define TARGET_TIMEOUT 100000000 /* 100ms in nanoseconds */
--- a/tools/testing/selftests/timers/nanosleep.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/nanosleep.c
@@ -28,7 +28,7 @@
#include <string.h>
#include <signal.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
#define CLOCK_HWSPECIFIC 10
--- a/tools/testing/selftests/timers/nsleep-lat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/nsleep-lat.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <signal.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define UNRESONABLE_LATENCY 40000000 /* 40ms in nanosecs */
--- a/tools/testing/selftests/timers/posix_timers.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/posix_timers.c
@@ -19,7 +19,7 @@
#include <include/vdso/time64.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define DELAY 2
--- a/tools/testing/selftests/timers/raw_skew.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/raw_skew.c
@@ -26,7 +26,7 @@
#include <sys/timex.h>
#include <time.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define shift_right(x, s) ({ \
__typeof__(x) __x = (x); \
--- a/tools/testing/selftests/timers/rtcpie.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/rtcpie.c
@@ -18,7 +18,7 @@
#include <stdlib.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/*
* This expects the new RTC class driver framework, working with
--- a/tools/testing/selftests/timers/set-2038.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-2038.c
@@ -28,7 +28,7 @@
#include <time.h>
#include <sys/time.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define KTIME_MAX ((long long)~((unsigned long long)1 << 63))
#define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC)
--- a/tools/testing/selftests/timers/set-tai.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-tai.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <signal.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int set_tai(int offset)
{
--- a/tools/testing/selftests/timers/set-timer-lat.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-timer-lat.c
@@ -29,7 +29,7 @@
#include <stdlib.h>
#include <pthread.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* CLOCK_HWSPECIFIC == CLOCK_SGI_CYCLE (Deprecated) */
#define CLOCK_HWSPECIFIC 10
--- a/tools/testing/selftests/timers/set-tz.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/set-tz.c
@@ -23,7 +23,7 @@
#include <string.h>
#include <signal.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int set_tz(int min, int dst)
{
--- a/tools/testing/selftests/timers/skew_consistency.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/skew_consistency.c
@@ -34,7 +34,7 @@
#include <fcntl.h>
#include <string.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(int argc, char **argv)
{
--- a/tools/testing/selftests/timers/threadtest.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/threadtest.c
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <sys/time.h>
#include <pthread.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* serializes shared list access */
pthread_mutex_t list_lock = PTHREAD_MUTEX_INITIALIZER;
--- a/tools/testing/selftests/timers/valid-adjtimex.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/timers/valid-adjtimex.c
@@ -30,7 +30,7 @@
#include <signal.h>
#include <unistd.h>
#include <include/vdso/time64.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define ADJ_SETOFFSET 0x0100
--- a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/tmpfs/bug-link-o-tmpfile.c
@@ -23,7 +23,7 @@
#include <sys/mount.h>
#include <unistd.h>
-#include "../kselftest.h"
+#include "kselftest.h"
int main(void)
{
--- a/tools/testing/selftests/tty/tty_tstamp_update.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/tty/tty_tstamp_update.c
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <linux/limits.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define MIN_TTY_PATH_LEN 8
--- a/tools/testing/selftests/uevent/uevent_filtering.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/uevent/uevent_filtering.c
@@ -19,7 +19,7 @@
#include <sys/wait.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#define __DEV_FULL "/sys/devices/virtual/mem/full/uevent"
#define __UEVENT_BUFFER_SIZE (2048 * 2)
--- a/tools/testing/selftests/user_events/abi_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/abi_test.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <asm/unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *data_file = "/sys/kernel/tracing/user_events_data";
--- a/tools/testing/selftests/user_events/dyn_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/dyn_test.c
@@ -14,7 +14,7 @@
#include <sys/stat.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *dyn_file = "/sys/kernel/tracing/dynamic_events";
--- a/tools/testing/selftests/user_events/ftrace_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/ftrace_test.c
@@ -15,7 +15,7 @@
#include <sys/uio.h>
#include <unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *data_file = "/sys/kernel/tracing/user_events_data";
--- a/tools/testing/selftests/user_events/perf_test.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/perf_test.c
@@ -16,7 +16,7 @@
#include <unistd.h>
#include <asm/unistd.h>
-#include "../kselftest_harness.h"
+#include "kselftest_harness.h"
#include "user_events_selftests.h"
const char *data_file = "/sys/kernel/tracing/user_events_data";
--- a/tools/testing/selftests/user_events/user_events_selftests.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/user_events/user_events_selftests.h
@@ -9,7 +9,7 @@
#include <unistd.h>
#include <errno.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static inline void tracefs_unmount(void)
{
--- a/tools/testing/selftests/vDSO/vdso_test_abi.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_abi.c
@@ -18,7 +18,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "vdso_config.h"
#include "vdso_call.h"
#include "parse_vdso.h"
--- a/tools/testing/selftests/vDSO/vdso_test_chacha.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_chacha.c
@@ -10,7 +10,7 @@
#include <string.h>
#include <stdint.h>
#include <stdbool.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#if defined(__aarch64__)
static bool cpu_has_capabilities(void)
--- a/tools/testing/selftests/vDSO/vdso_test_clock_getres.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_clock_getres.c
@@ -24,7 +24,7 @@
#include <unistd.h>
#include <sys/syscall.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static long syscall_clock_getres(clockid_t _clkid, struct timespec *_ts)
{
--- a/tools/testing/selftests/vDSO/vdso_test_correctness.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_correctness.c
@@ -21,7 +21,7 @@
#include "vdso_config.h"
#include "vdso_call.h"
-#include "../kselftest.h"
+#include "kselftest.h"
static const char **name;
--- a/tools/testing/selftests/vDSO/vdso_test_getcpu.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_getcpu.c
@@ -11,7 +11,7 @@
#include <sys/auxv.h>
#include <sys/time.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "parse_vdso.h"
#include "vdso_config.h"
#include "vdso_call.h"
--- a/tools/testing/selftests/vDSO/vdso_test_getrandom.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_getrandom.c
@@ -23,7 +23,7 @@
#include <linux/random.h>
#include <linux/ptrace.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#include "parse_vdso.h"
#include "vdso_config.h"
#include "vdso_call.h"
--- a/tools/testing/selftests/vDSO/vdso_test_gettimeofday.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/vDSO/vdso_test_gettimeofday.c
@@ -16,7 +16,7 @@
#include <sys/time.h>
#endif
-#include "../kselftest.h"
+#include "kselftest.h"
#include "parse_vdso.h"
#include "vdso_config.h"
#include "vdso_call.h"
--- a/tools/testing/selftests/x86/corrupt_xstate_header.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/corrupt_xstate_header.c
@@ -17,7 +17,7 @@
#include <stdint.h>
#include <sys/wait.h>
-#include "../kselftest.h" /* For __cpuid_count() */
+#include "kselftest.h" /* For __cpuid_count() */
#include "helpers.h"
static inline int xsave_enabled(void)
--- a/tools/testing/selftests/x86/helpers.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/helpers.h
@@ -7,7 +7,7 @@
#include <asm/processor-flags.h>
-#include "../kselftest.h"
+#include "kselftest.h"
static inline unsigned long get_eflags(void)
{
--- a/tools/testing/selftests/x86/lam.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/lam.c
@@ -18,7 +18,7 @@
#include <sys/uio.h>
#include <linux/io_uring.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#ifndef __x86_64__
# error This test is 64-bit only
--- a/tools/testing/selftests/x86/syscall_numbering.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/syscall_numbering.c
@@ -25,7 +25,7 @@
#include <sys/mman.h>
#include <linux/ptrace.h>
-#include "../kselftest.h"
+#include "kselftest.h"
/* Common system call numbers */
#define SYS_READ 0
--- a/tools/testing/selftests/x86/test_mremap_vdso.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/test_mremap_vdso.c
@@ -20,7 +20,7 @@
#include <sys/auxv.h>
#include <sys/syscall.h>
#include <sys/wait.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define PAGE_SIZE 4096
--- a/tools/testing/selftests/x86/test_vsyscall.c~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/test_vsyscall.c
@@ -21,7 +21,7 @@
#include <sys/uio.h>
#include "helpers.h"
-#include "../kselftest.h"
+#include "kselftest.h"
#ifdef __x86_64__
#define TOTAL_TESTS 13
--- a/tools/testing/selftests/x86/xstate.h~selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh
+++ a/tools/testing/selftests/x86/xstate.h
@@ -4,7 +4,7 @@
#include <stdint.h>
-#include "../kselftest.h"
+#include "kselftest.h"
#define XSAVE_HDR_OFFSET 512
#define XSAVE_HDR_SIZE 64
_
Patches currently in -mm which might be from reddybalavignesh9979@gmail.com are
selftests-centralise-maybe-unused-definition-in-kselftesth.patch
selftests-proc-mark-vsyscall-strings-maybe-unused.patch
selftests-centralize-include-path-for-kselftesth-and-kselftest_harnessh.patch
selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-08-31 20:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-08-27 22:56 + selftests-replace-relative-includes-with-non-relative-for-kselftesth-and-kselftest_harnessh.patch added to mm-nonmm-unstable branch Andrew Morton
-- strict thread matches above, loose matches on Subject: below --
2025-08-31 20:05 Andrew Morton
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).