cvs-cvs
[Top][All Lists]
Advanced

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

[Cvs-cvs] ccvs/src ChangeLog sanity.sh


From: Derek Robert Price
Subject: [Cvs-cvs] ccvs/src ChangeLog sanity.sh
Date: Thu, 02 Feb 2006 16:59:18 +0000

CVSROOT:        /cvsroot/cvs
Module name:    ccvs
Branch:         
Changes by:     Derek Robert Price <address@hidden>     06/02/02 16:59:18

Modified files:
        src            : ChangeLog sanity.sh 

Log message:
        * sanity.sh (sshstdio): Attempt to ignore spurious SSH output.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/ChangeLog.diff?tr1=1.3342&tr2=1.3343&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/cvs/ccvs/src/sanity.sh.diff?tr1=1.1108&tr2=1.1109&r1=text&r2=text

Patches:
Index: ccvs/src/ChangeLog
diff -u ccvs/src/ChangeLog:1.3342 ccvs/src/ChangeLog:1.3343
--- ccvs/src/ChangeLog:1.3342   Thu Feb  2 13:16:03 2006
+++ ccvs/src/ChangeLog  Thu Feb  2 16:59:17 2006
@@ -1,5 +1,7 @@
 2006-02-02  Derek Price  <address@hidden>
 
+       * sanity.sh (sshstdio): Attempt to ignore spurious SSH output.
+
        * server.c (do_cvs_command): Clarify FIXME.
 
 2006-02-01  Derek Price  <address@hidden>
Index: ccvs/src/sanity.sh
diff -u ccvs/src/sanity.sh:1.1108 ccvs/src/sanity.sh:1.1109
--- ccvs/src/sanity.sh:1.1108   Mon Jan 16 19:06:05 2006
+++ ccvs/src/sanity.sh  Thu Feb  2 16:59:18 2006
@@ -23599,14 +23599,29 @@
 #!$TESTSHELL
 exec "\$@" 2>&1 < /dev/null | cat
 EOF
+
+         # The sed monstrosity below is an attempt to ignore warnings output
+         # by some SSH clients but which don't appear to otherwise affect the
+         # results.  If stderr did not need to be merged with stdout for this
+         # test, then `2>/dev/null' would have done the trick.
           chmod +x wrapper.sh
           ./wrapper.sh \
            $testcvs -z5 -Q diff --side-by-side -W 500 -r 1.1 -r 1.2 \
-             aaa > wrapper.dif
+             aaa \
+          |sed -e \
+'/^Write failed flushing stdout buffer\.
\?$/d;
+ /^write stdout: Broken pipe
\?$/d;
+ : retry
+ /\(Write failed flushing stdout buffer\.\|write stdout: Broken pipe\)
\?$/{
+       N;
+       s/\(Write failed flushing stdout buffer\.\|write stdout: Broken pipe\)
\?\n//;
+       b retry;}' \
+          > wrapper.dif
   
           $testcvs -z5 -Q diff --side-by-side -W 500 -r 1.1 -r 1.2 \
              aaa > good.dif
-  
+
+
           dotest sshstdio-6 "$diff_u wrapper.dif good.dif"
 
          dokeep




reply via email to

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