[2.0] bmake: fix test issue (#13810)

Author: anphel31

SPECS/bmake/bmake.spec

@@ -1,7 +1,7 @@
 Summary:       The NetBSD make(1) tool
 Name:          bmake
 Version:       20211221
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       BSD
 Vendor:        Microsoft Corporation
 Distribution:  Mariner
@@ -11,6 +11,7 @@ Source0:       %{url}/bmake-%{version}.tar.gz
 # on pipeline machines. Disabling with this patch for now, and
 # tracking this bug in workitem 38644519
 Patch0:        remove-inconsistent-time-tests.patch
+Patch1:        do-not-run-tests-on-install.patch
 Requires:      mk-files
 
 BuildRequires: gcc
@@ -52,6 +53,11 @@ export STRIP=/bin/true # Make sure binary is not stripped
 mv %{buildroot}%{_mandir}/{cat,man}1
 chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
 
+%check
+# skip 'job-output-null' which randomly fails in build pipelines
+export BROKEN_TESTS=job-output-null
+./bmake -m mk test
+
 %files
 %doc ChangeLog README
 %license LICENSE
@@ -64,6 +70,10 @@ chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
 %{_datadir}/mk
 
 %changelog
+* Thu May 15 2025 Andrew Phelps <[email protected]> - 20211221-3
+- Move unit tests to check section
+- Disable unreliable test job-output-null
+
 * Tue Mar 22 2022 Cameron Baird <[email protected]> - 20211221-2
 - Add patch remove-inconsistent-time-tests.patch, which disables unreliably failing
 - tests in varmod-localtime.mk

SPECS/bmake/do-not-run-tests-on-install.patch

@@ -0,0 +1,11 @@
+diff -urN a/boot-strap b/boot-strap
+--- a/boot-strap	2025-05-16 03:40:30.989548051 +0000
++++ b/boot-strap	2025-05-16 03:40:51.653715837 +0000
+@@ -434,7 +434,6 @@
+ }
+ 
+ op_install() {
+-	op_test
+ 	case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
+ 	,$HOST_TARGET/bin,*/$HOST_TARGET)
+ 		INSTALL_PREFIX=`dirname $prefix`