From owner-svn-src-head@FreeBSD.ORG  Mon Aug 16 22:23:20 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3CE5A10656A5;
	Mon, 16 Aug 2010 22:23:20 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 10E498FC17;
	Mon, 16 Aug 2010 22:23:20 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o7GMNJ7K011551;
	Mon, 16 Aug 2010 22:23:19 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o7GMNJ70011546;
	Mon, 16 Aug 2010 22:23:19 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <201008162223.o7GMNJ70011546@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Mon, 16 Aug 2010 22:23:19 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r211408 - in head/tools/regression/bin/sh: builtins
	execution
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 16 Aug 2010 22:23:20 -0000

Author: jilles
Date: Mon Aug 16 22:23:19 2010
New Revision: 211408
URL: http://svn.freebsd.org/changeset/base/211408

Log:
  sh: Reduce unnecessary testsuite failures with other shells.

Modified:
  head/tools/regression/bin/sh/builtins/fc1.0
  head/tools/regression/bin/sh/builtins/fc2.0
  head/tools/regression/bin/sh/execution/redir1.0
  head/tools/regression/bin/sh/execution/redir2.0

Modified: head/tools/regression/bin/sh/builtins/fc1.0
==============================================================================
--- head/tools/regression/bin/sh/builtins/fc1.0	Mon Aug 16 21:59:56 2010	(r211407)
+++ head/tools/regression/bin/sh/builtins/fc1.0	Mon Aug 16 22:23:19 2010	(r211408)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 set -e
-trap 'echo Broken pipe -- test failed' pipe
+trap 'echo Broken pipe -- test failed' PIPE
 
 P=${TMPDIR:-/tmp}
 cd $P

Modified: head/tools/regression/bin/sh/builtins/fc2.0
==============================================================================
--- head/tools/regression/bin/sh/builtins/fc2.0	Mon Aug 16 21:59:56 2010	(r211407)
+++ head/tools/regression/bin/sh/builtins/fc2.0	Mon Aug 16 22:23:19 2010	(r211408)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 set -e
-trap 'echo Broken pipe -- test failed' pipe
+trap 'echo Broken pipe -- test failed' PIPE
 
 P=${TMPDIR:-/tmp}
 cd $P

Modified: head/tools/regression/bin/sh/execution/redir1.0
==============================================================================
--- head/tools/regression/bin/sh/execution/redir1.0	Mon Aug 16 21:59:56 2010	(r211407)
+++ head/tools/regression/bin/sh/execution/redir1.0	Mon Aug 16 22:23:19 2010	(r211408)
@@ -1,5 +1,5 @@
 # $FreeBSD$
-trap ': $((brokenpipe+=1))' pipe
+trap ': $((brokenpipe+=1))' PIPE
 
 P=${TMPDIR:-/tmp}
 cd $P
@@ -17,7 +17,7 @@ if [ $brokenpipe -ne 0 ]; then
 	rc=3
 fi
 wait
-echo dummy >&4
+echo dummy >&4 2>/dev/null
 if [ $brokenpipe -eq 1 ]; then
 	: ${rc:=0}
 fi

Modified: head/tools/regression/bin/sh/execution/redir2.0
==============================================================================
--- head/tools/regression/bin/sh/execution/redir2.0	Mon Aug 16 21:59:56 2010	(r211407)
+++ head/tools/regression/bin/sh/execution/redir2.0	Mon Aug 16 22:23:19 2010	(r211408)
@@ -1,5 +1,5 @@
 # $FreeBSD$
-trap ': $((brokenpipe+=1))' pipe
+trap ': $((brokenpipe+=1))' PIPE
 
 P=${TMPDIR:-/tmp}
 cd $P
@@ -17,7 +17,7 @@ mkfifo fifo1 fifo2
 
 exec 4>fifo2
 exec 3>fifo1
-echo dummy >&4
+echo dummy >&4 2>/dev/null
 if [ $brokenpipe -eq 1 ]; then
 	: ${rc:=0}
 fi