summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorjilles <jilles@FreeBSD.org>2010-08-16 22:23:19 +0000
committerjilles <jilles@FreeBSD.org>2010-08-16 22:23:19 +0000
commit71f5d949743cba25294b6b169ca73cacc12f77e0 (patch)
tree85a0cb34a6d915d621d24b7ac22f553aae448512 /tools
parent46021d25faf14947261c8989b53abf19c428d871 (diff)
downloadFreeBSD-src-71f5d949743cba25294b6b169ca73cacc12f77e0.zip
FreeBSD-src-71f5d949743cba25294b6b169ca73cacc12f77e0.tar.gz
sh: Reduce unnecessary testsuite failures with other shells.
Diffstat (limited to 'tools')
-rw-r--r--tools/regression/bin/sh/builtins/fc1.02
-rw-r--r--tools/regression/bin/sh/builtins/fc2.02
-rw-r--r--tools/regression/bin/sh/execution/redir1.04
-rw-r--r--tools/regression/bin/sh/execution/redir2.04
4 files changed, 6 insertions, 6 deletions
diff --git a/tools/regression/bin/sh/builtins/fc1.0 b/tools/regression/bin/sh/builtins/fc1.0
index 7cf0d94..59d10ef 100644
--- a/tools/regression/bin/sh/builtins/fc1.0
+++ b/tools/regression/bin/sh/builtins/fc1.0
@@ -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
diff --git a/tools/regression/bin/sh/builtins/fc2.0 b/tools/regression/bin/sh/builtins/fc2.0
index dc4b6de..4f696d4 100644
--- a/tools/regression/bin/sh/builtins/fc2.0
+++ b/tools/regression/bin/sh/builtins/fc2.0
@@ -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
diff --git a/tools/regression/bin/sh/execution/redir1.0 b/tools/regression/bin/sh/execution/redir1.0
index cc5cc49..dd0011f 100644
--- a/tools/regression/bin/sh/execution/redir1.0
+++ b/tools/regression/bin/sh/execution/redir1.0
@@ -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
diff --git a/tools/regression/bin/sh/execution/redir2.0 b/tools/regression/bin/sh/execution/redir2.0
index 079ee82..6976624 100644
--- a/tools/regression/bin/sh/execution/redir2.0
+++ b/tools/regression/bin/sh/execution/redir2.0
@@ -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
OpenPOWER on IntegriCloud