Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: develop/m4 fix make test
To:
Klemens Nanni <kn@openbsd.org>, YASUOKA Masahiko <yasuoka@openbsd.org>, <sthen@openbsd.org>, <tb@openbsd.org>
Cc:
<ports@openbsd.org>
Date:
Thu, 22 May 2025 10:25:18 +0100

Download raw body.

Thread
  • Stuart Henderson:

    develop/m4 fix make test

  • The REVISION bump is needed, this makes it into installed file 
    usr/local/info/m4.info-1
    
    -- 
      Sent from a phone, apologies for poor formatting.
    
    On 22 May 2025 10:06:42 Klemens Nanni <kn@openbsd.org> wrote:
    
    > 22.05.2025 11:56, YASUOKA Masahiko пишет:
    >> Hello,
    >>
    >> The diff makes "make test" pass on devel/m4.
    >>
    >> ok?
    >>
    >> Index: Makefile
    >> ===================================================================
    >> RCS file: /cvs/ports/devel/m4/Makefile,v
    >> diff -u -p -r1.41 Makefile
    >> --- Makefile	22 Apr 2025 18:18:15 -0000	1.41
    >> +++ Makefile	22 May 2025 08:54:54 -0000
    >> @@ -4,7 +4,7 @@ DISTNAME=	m4-1.4.19
    >>  CATEGORIES=	devel
    >>  SITES=		${SITE_GNU:=m4/}
    >>  EXTRACT_SUFX=	.tar.xz
    >> -REVISION=	0
    >> +REVISION=	1
    >
    > Looks like this is not needed since none of the patched files are in PLIST
    > and package contents otherwise don't change, either.
    >
    > Never hurts, though.
    >
    >>
    >>  HOMEPAGE=	https://www.gnu.org/software/m4/
    >>
    >> @@ -17,6 +17,9 @@ CONFIGURE_STYLE= gnu
    >>  CONFIGURE_ARGS=	--program-prefix="g" \
    >>  		--disable-nls \
    >>  		--without-libiconv-prefix
    >> +
    >> +# $HOME must exist for cvs that is used by tests/test-vc-list-files-cvs.sh
    >> +PORTHOME=      ${WRKDIR}
    >
    > Just exist or does it have to be writable?
    >
    >>
    >>  post-install:
    >>  	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gm4
    >> Index: patches/patch-doc_m4_texi
    >> ===================================================================
    >> RCS file: /cvs/ports/devel/m4/patches/patch-doc_m4_texi,v
    >> diff -u -p -r1.4 patch-doc_m4_texi
    >> --- patches/patch-doc_m4_texi	4 Dec 2024 09:51:29 -0000	1.4
    >> +++ patches/patch-doc_m4_texi	22 May 2025 08:54:54 -0000
    >> @@ -1,3 +1,7 @@
    >> +Redirect stderr to /dev/null, since our /bin/sh prints "Killed" when a
    >> +subprocess is died by a KILL signal.  Delete that message since that is
    >
    > is -> has, but you can probably just omit the " when ... signal." part.
    >
    >> +out of the scope of the test.
    >> +
    >
    > So is this a cosmetic error or does something check stderr and thus fails?
    >
    > The former seems uneeded, the latter could be explained more clearly.
    >
    >>  Index: doc/m4.texi
    >>  --- doc/m4.texi.orig
    >>  +++ doc/m4.texi
    >> @@ -10,3 +14,12 @@ Index: doc/m4.texi
    >>   @end direntry
    >>
    >>   @titlepage
    >> +@@ -6756,7 +6756,7 @@ ifdef(`__unix__', ,
    >> + ')m4exit(`77')')dnl
    >> + changequote(`[', `]')
    >> + @result{}
    >> +-syscmd([/bin/sh -c 'kill -9 $$'; st=$?; test $st = 137 || test $st = 265])
    >> ++syscmd([/bin/sh -c 'kill -9 $$'2>/dev/null; st=$?; test $st = 137 || test 
    >> $st = 265])
    >
    > Better redirect inside the single quotes to only silence kill(1) and not the
    > whole sh(1) process.
    >
    >> + @result{}
    >> + ifelse(sysval, [0], , [errprint([ skipping: shell does not send signal 9
    >> + ])m4exit([77])])dnl
    >> Index: patches/patch-tests_test-sys_wait_c
    >> ===================================================================
    >> RCS file: patches/patch-tests_test-sys_wait_c
    >> diff -N patches/patch-tests_test-sys_wait_c
    >> --- /dev/null	1 Jan 1970 00:00:00 -0000
    >> +++ patches/patch-tests_test-sys_wait_c	22 May 2025 08:54:54 -0000
    >> @@ -0,0 +1,13 @@
    >> +workaround for #include puzzle
    >
    > Could you mention what fails and or how?
    >
    > Otherwise this is just a new puzzle for porters trying to understand the patch.
    >
    >> +
    >> +Index: tests/test-sys_wait.c
    >> +--- tests/test-sys_wait.c.orig
    >> ++++ tests/test-sys_wait.c
    >> +@@ -18,6 +18,7 @@
    >> +
    >> + #include <config.h>
    >> +
    >> ++#include <sys/time.h>
    >> + #include <sys/wait.h>
    >> +
    >> + /* Check for existence of required types.  */
    >>
    
    
  • Stuart Henderson:

    develop/m4 fix make test