svn commit: r551474 - in head/devel/bmake: . files
Kyle Evans
kevans at FreeBSD.org
Mon Oct 5 03:42:17 UTC 2020
Author: kevans
Date: Mon Oct 5 03:42:16 2020
New Revision: 551474
URL: https://svnweb.freebsd.org/changeset/ports/551474
Log:
devel/bmake: disable cmd-interrupt test in batch builds
This fixes the build under modern poudriere, but continues to run the test
in all other environments so that we *can* catch issues here if they arise.
The breakage should get fixed on the poudriere or base sh(1) side, but this
will not necessarily be done soon.
Reported by: mjg
Approved by: portmgr (implicit, bulk fix)
MFH: 2020Q4 (blanket: trivial build fix)
Added:
head/devel/bmake/files/
head/devel/bmake/files/extrapatch-unit-tests_Makefile (contents, props changed)
Modified:
head/devel/bmake/Makefile
Modified: head/devel/bmake/Makefile
==============================================================================
--- head/devel/bmake/Makefile Mon Oct 5 01:51:02 2020 (r551473)
+++ head/devel/bmake/Makefile Mon Oct 5 03:42:16 2020 (r551474)
@@ -17,6 +17,10 @@ WRKSRC= ${WRKDIR}/${PORTNAME}
MAKE_ENV+= CONFIG_SITE=${CONFIG_SITE}
+.if defined(BATCH)
+EXTRA_PATCHES= ${FILESDIR}/extrapatch-unit-tests_Makefile
+.endif
+
post-patch: .SILENT
${REINPLACE_CMD} 's/^\.Nx/NetBSD/' ${WRKDIR}/bmake/bmake.1
Added: head/devel/bmake/files/extrapatch-unit-tests_Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/bmake/files/extrapatch-unit-tests_Makefile Mon Oct 5 03:42:16 2020 (r551474)
@@ -0,0 +1,11 @@
+--- unit-tests/Makefile.orig 2020-10-05 03:28:18 UTC
++++ unit-tests/Makefile
+@@ -36,7 +36,7 @@
+ # src/tests/usr.bin/make/t_make.sh as well.
+ TESTS+= # archive # broken on FreeBSD, enabled in t_make.sh
+ TESTS+= archive-suffix
+-TESTS+= cmd-interrupt
++TESTS+= # cmd-interrupt
+ TESTS+= cmdline
+ TESTS+= comment
+ TESTS+= cond-cmp-numeric
More information about the svn-ports-all
mailing list