git: 816129210ad4 - main - tests: Don't recurse into sys/compat32

From: Jessica Clarke <jrtc27_at_FreeBSD.org>
Date: Tue, 16 May 2023 01:09:35 UTC
The branch main has been updated by jrtc27:

URL: https://cgit.FreeBSD.org/src/commit/?id=816129210ad4f951059db2d942b8213ffe0a0f89

commit 816129210ad4f951059db2d942b8213ffe0a0f89
Author:     Jessica Clarke <jrtc27@FreeBSD.org>
AuthorDate: 2023-05-16 01:06:34 +0000
Commit:     Jessica Clarke <jrtc27@FreeBSD.org>
CommitDate: 2023-05-16 01:06:34 +0000

    tests: Don't recurse into sys/compat32
    
    Stubbing out the whole file means it has no targets, so recursive makes
    fail with "don't know how to make X". We could fix that, but because the
    level above is adding it to TESTS_SUBDIRS it'll generate an include line
    for the subdirectory in its Kyuafile, which won't work (the problem that
    was previously seen on non-aarch64 in CI). Thus we really need to not
    even add it to TESTS_SUBDIRS in the first place.
    
    Reported by:    Dan Mack <mack@macktronics.com>
    Fixes:          28f66935d400 ("tests: Disable sys/compat32 and sys/compat32/aarch64 tests")
---
 tests/sys/Makefile          | 3 ++-
 tests/sys/compat32/Makefile | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/sys/Makefile b/tests/sys/Makefile
index 3e9a30105a1d..c4549e361f99 100644
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -10,7 +10,8 @@ TESTS_SUBDIRS+=		${_audit}
 TESTS_SUBDIRS+=		auditpipe
 TESTS_SUBDIRS+=		capsicum
 TESTS_SUBDIRS+=		${_cddl}
-TESTS_SUBDIRS+=		compat32
+# XXX: Currently broken in CI
+#TESTS_SUBDIRS+=		compat32
 TESTS_SUBDIRS+=		devrandom
 TESTS_SUBDIRS+=		fifo
 TESTS_SUBDIRS+=		file
diff --git a/tests/sys/compat32/Makefile b/tests/sys/compat32/Makefile
index 3dd5ca218d00..31834de16246 100644
--- a/tests/sys/compat32/Makefile
+++ b/tests/sys/compat32/Makefile
@@ -1,8 +1,6 @@
-# XXX: Currently broken in CI
-.if 0
+
 .if exists(${.CURDIR}/${MACHINE_ARCH})
 SUBDIR+=	${MACHINE_ARCH}
 .endif
 
 .include <bsd.subdir.mk>
-.endif