From owner-svn-ports-all@freebsd.org Sat Sep 10 18:53:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 03608BD570A; Sat, 10 Sep 2016 18:53:58 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id AA77281F; Sat, 10 Sep 2016 18:53:57 +0000 (UTC) (envelope-from mandree@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8AIruJK071092; Sat, 10 Sep 2016 18:53:56 GMT (envelope-from mandree@FreeBSD.org) Received: (from mandree@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8AIruXT071090; Sat, 10 Sep 2016 18:53:56 GMT (envelope-from mandree@FreeBSD.org) Message-Id: <201609101853.u8AIruXT071090@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mandree set sender to mandree@FreeBSD.org using -f From: Matthias Andree Date: Sat, 10 Sep 2016 18:53:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421726 - in head/sysutils/e2fsprogs: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 10 Sep 2016 18:53:58 -0000 Author: mandree Date: Sat Sep 10 18:53:56 2016 New Revision: 421726 URL: https://svnweb.freebsd.org/changeset/ports/421726 Log: Ignore SIGINFO during self-tests. In the FreeBSD-specific patch, when the environment variable e2fsprogs_inhibit_SIGINFO exists (whatever its content, even if empty), do NOT install the SIGINFO handler. Leverage this when running the self-tests. This is to avoid false negatives during the self-tests due to interspersed SIGINFO output redirected from stderr to the log files. Bump PORTREVISION because this changes the e2fsck utility. Modified: head/sysutils/e2fsprogs/Makefile head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Modified: head/sysutils/e2fsprogs/Makefile ============================================================================== --- head/sysutils/e2fsprogs/Makefile Sat Sep 10 18:32:26 2016 (r421725) +++ head/sysutils/e2fsprogs/Makefile Sat Sep 10 18:53:56 2016 (r421726) @@ -3,7 +3,7 @@ PORTNAME= e2fsprogs PORTVERSION= 1.43.3 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES?= sysutils MASTER_SITES= KERNEL_ORG/linux/kernel/people/tytso/${PORTNAME}/v${PORTVERSION} @@ -195,7 +195,7 @@ post-build: @${ECHO_CMD} '===> Running e2fsprogs self-test suite' # do not add -j options unconditionally to ${MAKE_CMD} below, this might break # due to excessive disk space use. - cd ${WRKSRC}/tests && ulimit -t 60 && ${MKDIR} ${WRKDIR}/tmp && ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \ + cd ${WRKSRC}/tests && ulimit -t 60 && ${MKDIR} ${WRKDIR}/tmp && ${SETENV} e2fsprogs_inhibit_SIGINFO=1 ${MAKE_CMD} check ${_CHECK_JOBS} ${_checkaddargs} \ || { head -n30000 ${WRKSRC}/tests/*.failed 2>/dev/null ; exit 1 ; } .else @${ECHO_CMD} '===> SKIPPING e2fsprogs self-test suite (DISCOURAGED!)' Modified: head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c ============================================================================== --- head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Sat Sep 10 18:32:26 2016 (r421725) +++ head/sysutils/e2fsprogs/files/patch-e2fsck__unix.c Sat Sep 10 18:53:56 2016 (r421726) @@ -61,12 +61,14 @@ static void signal_progress_off(int sig EXT2FS_ATTR((unused))) { e2fsck_t ctx = e2fsck_global_ctx; -@@ -1062,6 +1089,8 @@ static errcode_t PRS(int argc, char *arg +@@ -1062,6 +1089,10 @@ static errcode_t PRS(int argc, char *arg sigaction(SIGUSR1, &sa, 0); sa.sa_handler = signal_progress_off; sigaction(SIGUSR2, &sa, 0); + sa.sa_handler = signal_progress_now; -+ sigaction(SIGINFO, &sa, 0); ++ if (!getenv("e2fsprogs_inhibit_SIGINFO")) { ++ sigaction(SIGINFO, &sa, 0); ++ } #endif /* Update our PATH to include /sbin if we need to run badblocks */