Messages in this thread | | | Date | Fri, 19 Aug 2022 17:14:07 -0700 | Subject | Re: [PATCH v2 2/2] selftests/vm: use top_srcdir instead of recomputing relative paths | From | John Hubbard <> |
| |
On 8/19/22 12:19, Axel Rasmussen wrote: > 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> > --- > tools/testing/selftests/vm/Makefile | 2 +- > tools/testing/selftests/vm/gup_test.c | 2 +- > tools/testing/selftests/vm/hmm-tests.c | 4 ++-- > tools/testing/selftests/vm/ksm_tests.c | 2 +- > 4 files changed, 5 insertions(+), 5 deletions(-)
Very nice, thank you for the extra cleanup here.
Reviewed-by: John Hubbard <jhubbard@nvidia.com>
thanks, -- John Hubbard NVIDIA
> > diff --git a/tools/testing/selftests/vm/Makefile b/tools/testing/selftests/vm/Makefile > index d9fa6a9ea584..d516b8c38eed 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 a309876d832f..e43879291dac 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 529f53b40296..98b949c279be 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 f5e4e0bbd081..0d85be2350fa 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/"
| |