diff options
author | Axel Rasmussen <axelrasmussen@google.com> | 2022-08-19 12:19:29 -0700 |
---|---|---|
committer | Shuah Khan <skhan@linuxfoundation.org> | 2022-10-05 11:05:17 -0600 |
commit | 0e29bc0ebaabf4e5270a23fd5ccce06fac3e140d (patch) | |
tree | 4ebc983e05273494307155c5d785d09dd06c6637 | |
parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) | |
download | staging-0e29bc0ebaabf4e5270a23fd5ccce06fac3e140d.tar.gz |
selftests/vm: use top_srcdir instead of recomputing relative paths
In various places both in t/t/s/v/Makefile as well as some of the test
sources, we were referring to headers or directories using some fairly
long relative paths.
Since we have a working top_srcdir variable though, which refers to the
root of the kernel tree, we can clean up all of these "up and over"
relative paths, just relying on the single variable instead.
Signed-off-by: Axel Rasmussen <axelrasmussen@google.com>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
-rw-r--r-- | tools/testing/selftests/vm/Makefile | 2 | ||||
-rw-r--r-- | tools/testing/selftests/vm/gup_test.c | 2 | ||||
-rw-r--r-- | tools/testing/selftests/vm/hmm-tests.c | 4 | ||||
-rw-r--r-- | tools/testing/selftests/vm/ksm_tests.c | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile index d9fa6a9ea5844f..d516b8c38eed54 100644 --- a/tools/testing/selftests/vm/Makefile +++ b/tools/testing/selftests/vm/Makefile @@ -25,7 +25,7 @@ MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/' -e 's/ppc64.*/p # LDLIBS. MAKEFLAGS += --no-builtin-rules -CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) +CFLAGS = -Wall -I $(top_srcdir) -I $(top_srcdir)/usr/include $(EXTRA_CFLAGS) $(KHDR_INCLUDES) LDLIBS = -lrt -lpthread TEST_GEN_FILES = compaction_test TEST_GEN_FILES += gup_test diff --git a/tools/testing/selftests/vm/gup_test.c b/tools/testing/selftests/vm/gup_test.c index a309876d832fb7..e43879291dacda 100644 --- a/tools/testing/selftests/vm/gup_test.c +++ b/tools/testing/selftests/vm/gup_test.c @@ -10,7 +10,7 @@ #include <sys/types.h> #include <pthread.h> #include <assert.h> -#include "../../../../mm/gup_test.h" +#include <mm/gup_test.h> #include "../kselftest.h" #include "util.h" diff --git a/tools/testing/selftests/vm/hmm-tests.c b/tools/testing/selftests/vm/hmm-tests.c index 529f53b4029633..98b949c279be79 100644 --- a/tools/testing/selftests/vm/hmm-tests.c +++ b/tools/testing/selftests/vm/hmm-tests.c @@ -35,8 +35,8 @@ * This is a private UAPI to the kernel test module so it isn't exported * in the usual include/uapi/... directory. */ -#include "../../../../lib/test_hmm_uapi.h" -#include "../../../../mm/gup_test.h" +#include <lib/test_hmm_uapi.h> +#include <mm/gup_test.h> struct hmm_buffer { void *ptr; diff --git a/tools/testing/selftests/vm/ksm_tests.c b/tools/testing/selftests/vm/ksm_tests.c index f5e4e0bbd08153..0d85be2350fa36 100644 --- a/tools/testing/selftests/vm/ksm_tests.c +++ b/tools/testing/selftests/vm/ksm_tests.c @@ -11,7 +11,7 @@ #include <err.h> #include "../kselftest.h" -#include "../../../../include/vdso/time64.h" +#include <include/vdso/time64.h> #include "util.h" #define KSM_SYSFS_PATH "/sys/kernel/mm/ksm/" |