Skip to content

Commit

Permalink
selftests/vm: use top_srcdir instead of recomputing relative paths
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Axel Rasmussen authored and Shuah Khan committed Oct 5, 2022
1 parent 568035b commit 0e29bc0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion tools/testing/selftests/vm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/vm/gup_test.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions tools/testing/selftests/vm/hmm-tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion tools/testing/selftests/vm/ksm_tests.c
Original file line number Diff line number Diff line change
Expand Up @@ -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/"
Expand Down

0 comments on commit 0e29bc0

Please sign in to comment.