Skip to content

Commit 10abee5

Browse files
authored
[3.0] bmake: move tests to check section (#13815)
1 parent 293fd84 commit 10abee5

2 files changed

Lines changed: 19 additions & 1 deletion

File tree

SPECS/bmake/bmake.spec

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
Summary: The NetBSD make(1) tool
22
Name: bmake
33
Version: 20230723
4-
Release: 1%{?dist}
4+
Release: 2%{?dist}
55
License: BSD
66
Vendor: Microsoft Corporation
77
Distribution: Azure Linux
88
URL: https://ftp.netbsd.org/pub/NetBSD/misc/sjg/
99
Source0: %{url}/bmake-%{version}.tar.gz
10+
Patch0: do-not-run-tests-on-install.patch
1011
BuildRequires: gcc
1112
BuildRequires: sed
1213
BuildRequires: util-linux
@@ -44,6 +45,9 @@ sh ./make-bootstrap.sh
4445
./bmake -m mk install DESTDIR=%{buildroot} INSTALL='install -p' STRIP_FLAG=''
4546
chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
4647

48+
%check
49+
./bmake -m mk test
50+
4751
%files
4852
%doc ChangeLog README
4953
%license LICENSE
@@ -56,6 +60,9 @@ chmod a-x %{buildroot}%{_datadir}/mk/mkopt.sh
5660
%{_datadir}/mk
5761

5862
%changelog
63+
* Thu May 15 2025 Andrew Phelps <anphel@microsoft.com> - 20230723-2
64+
- Move unit tests to check section
65+
5966
* Fri Dec 08 2023 Andrew Phelps <anphel@microsoft.com> - 20230723-1
6067
- Upgrade to version 20230723
6168

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -urN a/boot-strap b/boot-strap
2+
--- a/boot-strap 2025-05-16 06:04:26.984623406 +0000
3+
+++ b/boot-strap 2025-05-16 06:04:44.596770493 +0000
4+
@@ -461,7 +461,6 @@
5+
}
6+
7+
op_install() {
8+
- op_test
9+
case "$INSTALL_PREFIX,$INSTALL_BIN,$prefix" in
10+
,$HOST_TARGET/bin,*/$HOST_TARGET)
11+
INSTALL_PREFIX=`dirname $prefix`

0 commit comments

Comments
 (0)