Page MenuHomeFreeBSD
Files F161071439

D40224.diff
No OneTemporary
Actions

D40224.diff
View Options

diff --git a/tests/sys/Makefile b/tests/sys/Makefile
--- a/tests/sys/Makefile
+++ b/tests/sys/Makefile
@@ -10,8 +10,7 @@
TESTS_SUBDIRS+= auditpipe
TESTS_SUBDIRS+= capsicum
TESTS_SUBDIRS+= ${_cddl}
-# XXX: Currently broken in CI
-#TESTS_SUBDIRS+= compat32
+TESTS_SUBDIRS+= compat32
TESTS_SUBDIRS+= devrandom
TESTS_SUBDIRS+= fifo
TESTS_SUBDIRS+= file
diff --git a/tests/sys/compat32/Makefile b/tests/sys/compat32/Makefile
--- a/tests/sys/compat32/Makefile
+++ b/tests/sys/compat32/Makefile
@@ -1,6 +1,9 @@
+PACKAGE= tests
.if exists(${.CURDIR}/${MACHINE_ARCH})
-SUBDIR+= ${MACHINE_ARCH}
+.include "${MACHINE_ARCH}/Makefile.inc"
.endif
-.include <bsd.subdir.mk>
+TESTSDIR= ${TESTSBASE}/sys/compat32
+
+.include <bsd.test.mk>
diff --git a/tests/sys/compat32/Makefile.inc b/tests/sys/compat32/Makefile.inc
deleted file mode 100644
--- a/tests/sys/compat32/Makefile.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-
-TESTSDIR= ${TESTSBASE}/sys/compat32
-
-.include "../Makefile.inc"
diff --git a/tests/sys/compat32/aarch64/Makefile b/tests/sys/compat32/aarch64/Makefile.inc
rename from tests/sys/compat32/aarch64/Makefile
rename to tests/sys/compat32/aarch64/Makefile.inc
--- a/tests/sys/compat32/aarch64/Makefile
+++ b/tests/sys/compat32/aarch64/Makefile.inc
@@ -1,6 +1,5 @@
-# XXX: Doesn't work with GCC and requires an LLVM with the ARM backend
.if 0
-PACKAGE= tests
+# XXX: Doesn't work with GCC and requires an LLVM with the ARM backend
FILESGROUPS+= asmprogs
ACFLAGS= -target armv7-unknown-freebsd${OS_REVISION} -nostdlib -Wl,-e -Wl,main -static
@@ -22,6 +21,4 @@
${aprog}: ${aprog}.S
${CC} ${ACFLAGS} -o ${.TARGET} ${.ALLSRC}
.endfor
-
-.include <bsd.test.mk>
.endif

File Metadata

Mime Type
text/plain
Expires
Wed, Jul 1, 8:06 AM (10 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34549316
Default Alt Text
D40224.diff (1 KB)

Event Timeline