Re: [PATCH v2 05/31] selftests/mm: Use TEST_GEN_PROGS where proper

[Peter Xu <peterx@redhat.com>]

[-- Attachment #1: Type: text/plain, Size: 931 bytes --]

On Sat, Apr 15, 2023 at 04:44:47PM +0100, Lorenzo Stoakes wrote:
> >  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).

Right, thanks for reporting.

This patch will need a fixup.  After we start to build all tests for real I
found that the other patch "selftests/mm: uffd_[un]register()" actually
broke build for testcase hugepage-mremap.c on missing headers.

I've attached two fixups and attached, one for this patch, one for the
other one.  I hope we can just queue these two fixups in Andrew's tree, or
I'll see what I should do.

Thanks,

-- 
Peter Xu

[-- Attachment #2: 0001-fixup-selftests-mm-use-TEST_GEN_PROGS-where-proper.patch --]
[-- Type: text/plain, Size: 899 bytes --]

From 3ae6d1a0af0aff93734c9b07ff75dc89d3feafaf Mon Sep 17 00:00:00 2001
From: Peter Xu <peterx@redhat.com>
Date: Sun, 16 Apr 2023 17:35:02 -0400
Subject: [PATCH 1/2] fixup! selftests/mm: use TEST_GEN_PROGS where proper

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 tools/testing/selftests/mm/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/mm/Makefile b/tools/testing/selftests/mm/Makefile
index 5a3434419403..63c03a6414fc 100644
--- a/tools/testing/selftests/mm/Makefile
+++ b/tools/testing/selftests/mm/Makefile
@@ -42,7 +42,7 @@ TEST_GEN_PROGS += hugepage-mremap
 TEST_GEN_PROGS += hugepage-shm
 TEST_GEN_PROGS += hugepage-vmemmap
 TEST_GEN_PROGS += khugepaged
-TEST_GEN_PROGS = madv_populate
+TEST_GEN_PROGS += madv_populate
 TEST_GEN_PROGS += map_fixed_noreplace
 TEST_GEN_PROGS += map_hugetlb
 TEST_GEN_PROGS += map_populate
-- 
2.39.1


[-- Attachment #3: 0002-fixup-selftests-mm-uffd_-un-register.patch --]
[-- Type: text/plain, Size: 816 bytes --]

From b301e2301120d70477f3ae539704cfc0fe031119 Mon Sep 17 00:00:00 2001
From: Peter Xu <peterx@redhat.com>
Date: Sun, 16 Apr 2023 17:36:37 -0400
Subject: [PATCH 2/2] fixup! selftests/mm: uffd_[un]register()

Signed-off-by: Peter Xu <peterx@redhat.com>
---
 tools/testing/selftests/mm/hugepage-mremap.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tools/testing/selftests/mm/hugepage-mremap.c b/tools/testing/selftests/mm/hugepage-mremap.c
index 2084692fe1c4..cabd0084f57b 100644
--- a/tools/testing/selftests/mm/hugepage-mremap.c
+++ b/tools/testing/selftests/mm/hugepage-mremap.c
@@ -23,6 +23,8 @@
 #include <linux/userfaultfd.h>
 #include <sys/ioctl.h>
 #include <string.h>
+#include <stdbool.h>
+#include "vm_util.h"
 
 #define DEFAULT_LENGTH_MB 10UL
 #define MB_TO_BYTES(x) (x * 1024 * 1024)
-- 
2.39.1