From nobody Thu Jun 30 07:18:53 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C800887BCA9; Thu, 30 Jun 2022 07:18:53 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LYV7K5HsNz3Qfy; Thu, 30 Jun 2022 07:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656573533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CoU7Zf273Xd4ct9Hk4XxvWoaLOOJGsxQScXbeOLFfyo=; b=wU41wwKX71OrV95S/U8xjggEgwb/FoUnrr3Ad1XY+CQy2PThpuKHc4uMf/8SHdUnnV1Nzt H1TLg+kdTv73M0IwTWEWQZRgii4l1zjdxjbJGV9LwUGCN6G5KEBnxvgy4EvNnsu/Q45j5l LpWJeur1j6LBoz5Wl68FTOs8rUcefEUv/GJJds4m92WfFj8ulifX64SQ9yrB1ldiK54uwF madgP7M040zdvoXTHYQAboVbc9GjZYXCevStJ546rX0Jk5siptP7z1hO9/E6duxurMvwBL SZdvojYWRhSAV0m3Bix1iURvORgw8EY9Ns22jGXZMlB7A0pGwWefgivHnTOJ7g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 968CA218FB; Thu, 30 Jun 2022 07:18:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25U7Irka084472; Thu, 30 Jun 2022 07:18:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25U7IrGx084471; Thu, 30 Jun 2022 07:18:53 GMT (envelope-from git) Date: Thu, 30 Jun 2022 07:18:53 GMT Message-Id: <202206300718.25U7IrGx084471@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Mikolaj Golub Subject: git: 69f9eae5417a - main - devel/bmake: don't run tests on build List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: trociny X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69f9eae5417aaf7156c499741a46512e05d4c62d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656573533; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CoU7Zf273Xd4ct9Hk4XxvWoaLOOJGsxQScXbeOLFfyo=; b=f6F5Y0mZYDKcnFdjMLEpJpalqdtdOsXmN1CquqiVfNZDrrXCF66lzHcC2UvW1CCnT9VZtD sgSnV/fKrBG6mDclsQzpyO+ZdO4Y1BtHEq7cnvSGVUIQGmYuA1IIaWaCvCWmuU67cVvvRb nqHr7IqxDBLeA0MYCgPtzSF0D4KKCeqeqG/TGixir9UtsnqXQPhg8KMq75LYvhHNll/wqH OqjGnXRiMgH24lt0RK/Fc4DA8A4x85VFeHTQOGv/HzEXT6t9yZXGpoq3vsEVkg1SA2kW+U oGgsSdnxyjz0ymeWSPu0+MdglJ9iQcxOYnhjsV5n3lBaFbbKiOH0LXqz+yPuDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656573533; a=rsa-sha256; cv=none; b=wgauAOCAeWtsVbgKXJ4YaoyOaakNwdTd8A+IVUsD0fkMnJiK/XImJzmOrq1vQCq4c5P7NU 8RfVMa6vhjuVgMiybDb4/bGXOZQrFyv0JGbYbHCzEGHbzTbp6obEcLOvzX5HX0kCxiImWV OtDHzhwURBJmQC9BAd1NFzO6cnMVzv3hmph9oQC4YxktxCvi8qGlsJEf4Vs3EU4S5VT160 u4pU8W88PucWDdnSX4FEfP2h/v7AJI/WFFkZi0DgcARDe790bbkorIsHeU4Zkg3GllYLsn frYpMkEno68//ySrDtExtbbHd+Lp0qiWimUHY2J0W/bDwS4OxjoqUjUtuKlmXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by trociny: URL: https://cgit.FreeBSD.org/ports/commit/?id=69f9eae5417aaf7156c499741a46512e05d4c62d commit 69f9eae5417aaf7156c499741a46512e05d4c62d Author: Mikolaj Golub AuthorDate: 2022-06-29 05:51:49 +0000 Commit: Mikolaj Golub CommitDate: 2022-06-30 07:18:10 +0000 devel/bmake: don't run tests on build Some tests are unreliable and we were fighting them by just disabling. So instead of running tests on build, provide "test" target. And now we may remove the patches that disabled failing tests. PR: 264856 --- devel/bmake/Makefile | 11 ++++---- devel/bmake/files/extrapatch-unit-tests_Makefile | 11 -------- devel/bmake/files/patch-boot-strap | 12 ++++++++ devel/bmake/files/patch-unit-tests_Makefile | 36 ------------------------ 4 files changed, 18 insertions(+), 52 deletions(-) diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile index 6ff12838e459..451676deb9f2 100644 --- a/devel/bmake/Makefile +++ b/devel/bmake/Makefile @@ -16,15 +16,16 @@ 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 do-build: - ${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap \ + ${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap op=build \ + --with-default-sys-path='.../share/mk:${PREFIX}/share/mk' \ + -m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX} + +do-test: + ${SETENV} ${MAKE_ENV} ${SH} ${WRKDIR}/bmake/boot-strap op=test \ --with-default-sys-path='.../share/mk:${PREFIX}/share/mk' \ -m ${WRKDIR}/mk objdir=${WRKDIR}/obj prefix=${PREFIX} diff --git a/devel/bmake/files/extrapatch-unit-tests_Makefile b/devel/bmake/files/extrapatch-unit-tests_Makefile deleted file mode 100644 index 38d1fcf8425a..000000000000 --- a/devel/bmake/files/extrapatch-unit-tests_Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- unit-tests/Makefile.orig 2020-11-29 08:44:23 UTC -+++ unit-tests/Makefile -@@ -38,7 +38,7 @@ - TESTS+= archive-suffix - TESTS+= cmd-errors - TESTS+= cmd-errors-lint --TESTS+= cmd-interrupt -+#TESTS+= cmd-interrupt - TESTS+= cmdline - TESTS+= cmdline-undefined - TESTS+= comment diff --git a/devel/bmake/files/patch-boot-strap b/devel/bmake/files/patch-boot-strap new file mode 100644 index 000000000000..e17b2d885bd0 --- /dev/null +++ b/devel/bmake/files/patch-boot-strap @@ -0,0 +1,12 @@ +--- boot-strap.orig 2022-06-29 08:25:21.380209000 +0300 ++++ boot-strap 2022-06-29 08:25:03.068725000 +0300 +@@ -413,9 +413,6 @@ + [ -s make-bootstrap.sh ] || op_configure + chmod 755 make-bootstrap.sh || exit 1 + ./make-bootstrap.sh || exit 1 +- case "$op" in +- build) op_test;; +- esac + } + + op_test() { diff --git a/devel/bmake/files/patch-unit-tests_Makefile b/devel/bmake/files/patch-unit-tests_Makefile deleted file mode 100644 index 4bdebdb047e2..000000000000 --- a/devel/bmake/files/patch-unit-tests_Makefile +++ /dev/null @@ -1,36 +0,0 @@ ---- unit-tests/Makefile.orig 2021-02-06 18:31:52 UTC -+++ unit-tests/Makefile -@@ -102,7 +102,7 @@ TESTS+= depsrc-exec - TESTS+= depsrc-ignore - TESTS+= depsrc-made - TESTS+= depsrc-make --TESTS+= depsrc-meta -+#TESTS+= depsrc-meta - TESTS+= depsrc-nometa - TESTS+= depsrc-nometa_cmp - TESTS+= depsrc-nopath -@@ -209,7 +209,7 @@ TESTS+= jobs-error-nested - TESTS+= jobs-error-nested-make - TESTS+= lint - TESTS+= make-exported --TESTS+= meta-cmd-cmp -+#TESTS+= meta-cmd-cmp - TESTS+= moderrs - TESTS+= modmatch - TESTS+= modmisc -@@ -339,13 +339,13 @@ TESTS+= varmod-defined - TESTS+= varmod-edge - TESTS+= varmod-exclam-shell - TESTS+= varmod-extension --TESTS+= varmod-gmtime -+#TESTS+= varmod-gmtime - TESTS+= varmod-hash - TESTS+= varmod-head - TESTS+= varmod-ifelse - TESTS+= varmod-indirect - TESTS+= varmod-l-name-to-value --TESTS+= varmod-localtime -+#TESTS+= varmod-localtime - TESTS+= varmod-loop - TESTS+= varmod-match - TESTS+= varmod-match-escape