bug-gawk
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [bug-gawk] make check: 2 TESTS FAILED


From: Aharon Robbins
Subject: Re: [bug-gawk] make check: 2 TESTS FAILED
Date: Sun, 20 Oct 2013 22:38:20 +0300
User-agent: Heirloom mailx 12.5 6/20/10

Here is a fresh patch, relative to what's in git.

Please let me know if this helps.

Arnold
-----------------
diff --git a/io.c b/io.c
index e0632d8..482041c 100644
--- a/io.c
+++ b/io.c
@@ -1261,11 +1261,11 @@ flush_io()
        int status = 0;
 
        errno = 0;
-       if (fflush(stdout)) {
+       if (fflush(stdout) && errno != EPIPE) {
                warning(_("error writing standard output (%s)"), 
strerror(errno));
                status++;
        }
-       if (fflush(stderr)) {
+       if (fflush(stderr) && errno != EPIPE) {
                warning(_("error writing standard error (%s)"), 
strerror(errno));
                status++;
        }
diff --git a/main.c b/main.c
index d765a43..9026fbf 100644
--- a/main.c
+++ b/main.c
@@ -849,7 +849,7 @@ By default it reads standard input and writes standard 
output.\n\n"), fp);
        fflush(fp);
 
        if (ferror(fp)) {
-               if (fp == stdout)
+               if (fp == stdout && errno != EPIPE)
                        warning(_("error writing standard output (%s)"), 
strerror(errno));
                exit(EXIT_FAILURE);
        }
@@ -886,7 +886,7 @@ along with this program. If not, see 
http://www.gnu.org/licenses/.\n";);
        fputs(_(blurb_part3), stdout);
        fflush(stdout);
 
-       if (ferror(stdout)) {
+       if (ferror(stdout) && errno != EPIPE) {
                warning(_("error writing standard output (%s)"), 
strerror(errno));
                exit(EXIT_FAILURE);
        }
diff --git a/test/Makefile.am b/test/Makefile.am
index abb3fb9..ff3db19 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1882,6 +1882,12 @@ backsmalls1:
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
+pipeio3:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @sed 's/sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv 
_x$@ _$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
 # Targets generated for other tests:
 include Maketests
 
diff --git a/test/Makefile.in b/test/Makefile.in
index 9676494..2ab56a5 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -2275,6 +2275,12 @@ backsmalls1:
        @[ -z "$$GAWKLOCALE" ] && GAWKLOCALE=en_US.UTF-8; \
        AWKPATH="$(srcdir)" $(AWK) -f address@hidden "$(srcdir)"/address@hidden 
>_$@ 2>&1 || echo EXIT CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
+
+pipeio3:
+       @echo $@
+       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
+       @sed 's/sh.*cart:.*not found/sh: 1: cart: not found/' < _$@ >_x$@ ; mv 
_x$@ _$@
+       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 Gt-dummy:
 # file Maketests, generated from Makefile.am by the Gentests program
 addcomma:
@@ -3184,11 +3190,6 @@ getlnhd:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-pipeio3:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 aadelete1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
diff --git a/test/Maketests b/test/Maketests
index 29f9a17..df272ce 100644
--- a/test/Maketests
+++ b/test/Maketests
@@ -907,11 +907,6 @@ getlnhd:
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
        @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
 
-pipeio3:
-       @echo $@
-       @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@
-       @-$(CMP) "$(srcdir)"/address@hidden _$@ && rm -f _$@
-
 aadelete1:
        @echo $@
        @AWKPATH="$(srcdir)" $(AWK) -f address@hidden  >_$@ 2>&1 || echo EXIT 
CODE: $$? >>_$@



reply via email to

[Prev in Thread] Current Thread [Next in Thread]