[Bug 281151] [patch] source upgrade path broken for stable/12 to stable/13 due to bmake

From: <bugzilla-noreply_at_freebsd.org>
Date: Sat, 31 Aug 2024 09:47:48 UTC
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=281151

            Bug ID: 281151
           Summary: [patch] source upgrade path broken for stable/12 to
                    stable/13 due to bmake
           Product: Base System
           Version: 13.4-STABLE
          Hardware: Any
                OS: Any
            Status: New
          Keywords: easy, patch-ready
          Severity: Affects Some People
          Priority: ---
         Component: bin
          Assignee: bugs@FreeBSD.org
          Reporter: eugen@freebsd.org
                CC: sjg@FreeBSD.org

I've just tried to "make builworld WITHOUT_TESTS=" with stable/12 system to
upgrade it to stable/13 and it failed:

===> usr.bin/bmake (obj)
===> usr.bin/bmake/unit-tests (obj)
make[6]: "/usr/src/usr.bin/bmake/unit-tests/Makefile" line 445: Malformed
conditional (${.SHELL:T}
== "ksh")
make[6]: "/usr/src/usr.bin/bmake/unit-tests/Makefile" line 774: Malformed
conditional (${.SHELL:T}
== "ksh")
make[6]: Fatal errors encountered -- cannot continue


Please consider something like the following change to respect WITHOUT_TESTS:

--- usr.bin/bmake/Makefile.orig       2024-08-31 08:37:49.762012000 +0000
+++ usr.bin/bmake/Makefile    2024-08-31 09:38:30.244280000 +0000
@@ -87,7 +87,8 @@
 .PATH: ${srcdir}

 .if make(obj) || make(clean)
-SUBDIR+= unit-tests
+HAS_TESTS=
+SUBDIR.${MK_TESTS}+=   unit-tests
 .endif

-- 
You are receiving this mail because:
You are the assignee for the bug.