svn commit: r421726 - in head/sysutils/e2fsprogs: . files
Matthias Andree
mandree at FreeBSD.org
Sat Sep 10 18:53:58 UTC 2016
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 */
More information about the svn-ports-head
mailing list