svn commit: r211408 - in head/tools/regression/bin/sh: builtins execution

[Jilles Tjoelker]

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