From owner-svn-ports-head@freebsd.org Mon Oct 5 03:42:17 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 758CB3F4F6C; Mon, 5 Oct 2020 03:42:17 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C4RHY2YNfz4blg; Mon, 5 Oct 2020 03:42:17 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 3ACA8F864; Mon, 5 Oct 2020 03:42:17 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0953gH8F055914; Mon, 5 Oct 2020 03:42:17 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0953gGpt055913; Mon, 5 Oct 2020 03:42:16 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <202010050342.0953gGpt055913@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Mon, 5 Oct 2020 03:42:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r551474 - in head/devel/bmake: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in head/devel/bmake: . files X-SVN-Commit-Revision: 551474 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Oct 2020 03:42:17 -0000 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