From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-11711-mason-zsh=primenet.com.au@sunsite.auc.dk>
Received: (qmail 7448 invoked from network); 1 Jun 2000 13:04:18 -0000
Received: from sunsite.auc.dk (130.225.51.30)
  by ns1.primenet.com.au with SMTP; 1 Jun 2000 13:04:18 -0000
Received: (qmail 4017 invoked by alias); 1 Jun 2000 13:04:04 -0000
Mailing-List: contact zsh-workers-help@sunsite.auc.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 11711
Received: (qmail 4010 invoked from network); 1 Jun 2000 13:04:04 -0000
X-Envelope-Sender-Is: Andrej.Borsenkow@mow.siemens.ru (at relayer david.siemens.de)
From: "Andrej Borsenkow" <Andrej.Borsenkow@mow.siemens.ru>
To: "Peter Stephenson" <pws@cambridgesiliconradio.com>,
   "Zsh hackers list" <zsh-workers@sunsite.auc.dk>
Subject: RE: Output of 'make check'
Date: Thu, 1 Jun 2000 17:03:39 +0400
Message-ID: <000001bfcbc9$ce422690$21c9ca95@mow.siemens.ru>
MIME-Version: 1.0
Content-Type: multipart/mixed;
	boundary="----=_NextPart_000_0001_01BFCBEB.55554D30"
X-Priority: 3 (Normal)
X-MSMail-Priority: Normal
X-Mailer: Microsoft Outlook IMO, Build 9.0.2416 (9.0.2911.0)
In-Reply-To: <0FVG001HSZXA60@la-la.cambridgesiliconradio.com>
Importance: Normal
X-MimeOLE: Produced By Microsoft MimeOLE V5.00.2919.6700

This is a multi-part message in MIME format.

------=_NextPart_000_0001_01BFCBEB.55554D30
Content-Type: text/plain;
	charset="koi8-r"
Content-Transfer-Encoding: 7bit

>
> > I do not particular like it. It outputs thousands of "No differences
> > encountered", that will scroll away any useful output. So,
> if any test
> > in between fails, there is no chance to see it unfortunately (there
> > seems to be no log by default). I just noticed, that one more test
> > failed - and it was only by accident.
>
> That's coming from your version of diff, not the test
> harness.  If you can
> find a portable way of suppressing it without removing the
> useful output, I
> will add it --- it may simply be a case of 2>/dev/null.
>

What about attached patch? (2>/dev/null does not work, diff outputs on
stdout).

Can we rely on the fact, that $? is set to exit code of command
substitution?

-andrej

------=_NextPart_000_0001_01BFCBEB.55554D30
Content-Type: application/octet-stream;
	name="ztst.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="ztst.diff"

--- Test/ztst.zsh.org	Wed May  3 13:24:47 2000=0A=
+++ Test/ztst.zsh	Thu Jun  1 16:54:31 2000=0A=
@@ -219,6 +219,19 @@=0A=
   done=0A=
 }=0A=
 =0A=
+# diff wrapper=0A=
+ZTST_diff() {=0A=
+  local diff_out diff_ret=0A=
+=0A=
+  diff_out=3D$(diff "$@")=0A=
+  diff_ret=3D"$?"=0A=
+  if [[ "$diff_ret" !=3D "0" ]]; then=0A=
+    echo "$diff_out"=0A=
+  fi=0A=
+=0A=
+  return "$diff_ret"=0A=
+}=0A=
+    =0A=
 ZTST_test() {=0A=
   local last match mbegin mend found=0A=
 =0A=
@@ -297,13 +310,13 @@=0A=
 $(<$ZTST_terr)"=0A=
 =0A=
       # Now check output and error.=0A=
-      if [[ $ZTST_flags !=3D *d* ]] && ! diff -c $ZTST_out $ZTST_tout; =
then=0A=
+      if [[ $ZTST_flags !=3D *d* ]] && ! ZTST_diff -c $ZTST_out =
$ZTST_tout; then=0A=
 	ZTST_testfailed "output differs from expected as shown above for:=0A=
 $ZTST_code${$(<$ZTST_terr):+=0A=
 Error output:=0A=
 $(<$ZTST_terr)}"=0A=
       fi=0A=
-      if [[ $ZTST_flags !=3D *D* ]] && ! diff -c $ZTST_err $ZTST_terr; =
then=0A=
+      if [[ $ZTST_flags !=3D *D* ]] && ! ZTST_diff -c $ZTST_err =
$ZTST_terr; then=0A=
 	ZTST_testfailed "error output differs from expected as shown above for:=0A=
 $ZTST_code"=0A=
       fi=0A=

------=_NextPart_000_0001_01BFCBEB.55554D30--