Attachment 234990 Details for Bug 264856 – devel/bmake: don't run tests on build

[patch] devel/bmake: don't run tests on build

devel-bmake-test.patch (text/plain), 3.51 KB, created by Mikolaj Golub on 2022-06-29 05:59:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Golub

Created: 2022-06-29 05:59:20 UTC

Size: 3.51 KB

patch

obsolete

>commit 2ac054c27b0c017c09cfaab5553e57f8b8180317
>Author: Mikolaj Golub <trociny@FreeBSD.org>
>Date:   Wed Jun 29 08:51:49 2022 +0300
>
>    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
>
>diff --git a/devel/bmake/Makefile b/devel/bmake/Makefile
>index 6ff12838e4..451676deb9 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 38d1fcf842..0000000000
>--- 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 0000000000..e17b2d885b
>--- /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 4bdebdb047..0000000000
>--- 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

Actions: View | Diff

Attachments on bug 264856: 234899 | 234990