On Wed, Apr 12, 2023 at 12:42:18PM -0400, Peter Xu wrote: > TEST_GEN_PROGS and TEST_GEN_FILES are used randomly in the mm/Makefile to > specify programs that need to build. Logically all these binaries should > all fall into TEST_GEN_PROGS. > > Replace those TEST_GEN_FILES with TEST_GEN_PROGS, so that we can reference > all the tests easily later. > > Reviewed-by: David Hildenbrand <david@xxxxxxxxxx> > Reviewed-by: Mike Rapoport (IBM) <rppt@xxxxxxxxxx> > Signed-off-by: Peter Xu <peterx@xxxxxxxxxx> > --- > tools/testing/selftests/mm/Makefile | 63 +++++++++++++++-------------- > 1 file changed, 32 insertions(+), 31 deletions(-) > > diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile > index 9d9822b4bf24..74988f5adc5f 100644 > --- a/tools/testing/selftests/mm/Makefile > +++ b/tools/testing/selftests/mm/Makefile > @@ -31,35 +31,36 @@ MAKEFLAGS += --no-builtin-rules > > CFLAGS = -Wall -I $(top_srcdir) $(EXTRA_CFLAGS) $(KHDR_INCLUDES) > LDLIBS = -lrt -lpthread > -TEST_GEN_FILES = cow > -TEST_GEN_FILES += compaction_test > -TEST_GEN_FILES += gup_test > -TEST_GEN_FILES += hmm-tests > -TEST_GEN_FILES += hugetlb-madvise > -TEST_GEN_FILES += hugepage-mmap > -TEST_GEN_FILES += hugepage-mremap > -TEST_GEN_FILES += hugepage-shm > -TEST_GEN_FILES += hugepage-vmemmap > -TEST_GEN_FILES += khugepaged > + > +TEST_GEN_PROGS = cow > +TEST_GEN_PROGS += compaction_test > +TEST_GEN_PROGS += gup_test > +TEST_GEN_PROGS += hmm-tests > +TEST_GEN_PROGS += hugetlb-madvise > +TEST_GEN_PROGS += hugepage-mmap > +TEST_GEN_PROGS += hugepage-mremap > +TEST_GEN_PROGS += hugepage-shm > +TEST_GEN_PROGS += hugepage-vmemmap > +TEST_GEN_PROGS += khugepaged > TEST_GEN_PROGS = madv_populate This now results in TEST_GEN_PROGS being set to "cow compaction_test gup_test..." then here that is discarded and we start again from madv_populate meaning none of the prior tests get built. I notice this today when trying to build the gup_test :) I think this should be a += not an = (which made sense before as there were two different variables being assigned then). > -TEST_GEN_FILES += map_fixed_noreplace > -TEST_GEN_FILES += map_hugetlb > -TEST_GEN_FILES += map_populate > -TEST_GEN_FILES += memfd_secret > -TEST_GEN_FILES += migration > +TEST_GEN_PROGS += map_fixed_noreplace > +TEST_GEN_PROGS += map_hugetlb > +TEST_GEN_PROGS += map_populate > +TEST_GEN_PROGS += memfd_secret > +TEST_GEN_PROGS += migration > TEST_GEN_PROGS += mkdirty > -TEST_GEN_FILES += mlock-random-test > -TEST_GEN_FILES += mlock2-tests > -TEST_GEN_FILES += mrelease_test > -TEST_GEN_FILES += mremap_dontunmap > -TEST_GEN_FILES += mremap_test > -TEST_GEN_FILES += on-fault-limit > -TEST_GEN_FILES += thuge-gen > -TEST_GEN_FILES += transhuge-stress > -TEST_GEN_FILES += userfaultfd > +TEST_GEN_PROGS += mlock-random-test > +TEST_GEN_PROGS += mlock2-tests > +TEST_GEN_PROGS += mrelease_test > +TEST_GEN_PROGS += mremap_dontunmap > +TEST_GEN_PROGS += mremap_test > +TEST_GEN_PROGS += on-fault-limit > +TEST_GEN_PROGS += thuge-gen > +TEST_GEN_PROGS += transhuge-stress > +TEST_GEN_PROGS += userfaultfd > TEST_GEN_PROGS += soft-dirty > TEST_GEN_PROGS += split_huge_page_test > -TEST_GEN_FILES += ksm_tests > +TEST_GEN_PROGS += ksm_tests > TEST_GEN_PROGS += ksm_functional_tests > TEST_GEN_PROGS += mdwe_test > > @@ -77,24 +78,24 @@ CFLAGS += -no-pie > endif > > ifeq ($(CAN_BUILD_I386),1) > -TEST_GEN_FILES += $(BINARIES_32) > +TEST_GEN_PROGS += $(BINARIES_32) > endif > > ifeq ($(CAN_BUILD_X86_64),1) > -TEST_GEN_FILES += $(BINARIES_64) > +TEST_GEN_PROGS += $(BINARIES_64) > endif > else > > ifneq (,$(findstring $(MACHINE),ppc64)) > -TEST_GEN_FILES += protection_keys > +TEST_GEN_PROGS += protection_keys > endif > > endif > > ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64)) > -TEST_GEN_FILES += va_128TBswitch > -TEST_GEN_FILES += virtual_address_range > -TEST_GEN_FILES += write_to_hugetlbfs > +TEST_GEN_PROGS += va_128TBswitch > +TEST_GEN_PROGS += virtual_address_range > +TEST_GEN_PROGS += write_to_hugetlbfs > endif > > TEST_PROGS := run_vmtests.sh > -- > 2.39.1 >
