summaryrefslogtreecommitdiff
path: root/regress/test-exec.sh
diff options
context:
space:
mode:
Diffstat (limited to 'regress/test-exec.sh')
-rw-r--r--regress/test-exec.sh19
1 files changed, 8 insertions, 11 deletions
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 650be419e..e44778065 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
1# $OpenBSD: test-exec.sh,v 1.28 2005/05/20 23:14:15 djm Exp $ 1# $OpenBSD: test-exec.sh,v 1.30 2007/10/26 05:30:01 djm Exp $
2# Placed in the Public Domain. 2# Placed in the Public Domain.
3 3
4#SUDO=sudo 4#SUDO=sudo
@@ -30,9 +30,6 @@ else
30 USER=`id -un` 30 USER=`id -un`
31fi 31fi
32 32
33# XXX platforms that don't support -E may need a replacement
34ECHOE="echo -E"
35
36OBJ=$1 33OBJ=$1
37if [ "x$OBJ" = "x" ]; then 34if [ "x$OBJ" = "x" ]; then
38 echo '$OBJ not defined' 35 echo '$OBJ not defined'
@@ -159,31 +156,31 @@ cleanup ()
159 156
160trace () 157trace ()
161{ 158{
162 $ECHOE "trace: $@" >>$TEST_SSH_LOGFILE 159 echo "trace: $@" >>$TEST_SSH_LOGFILE
163 if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then 160 if [ "X$TEST_SSH_TRACE" = "Xyes" ]; then
164 $ECHOE "$@" 161 echo "$@"
165 fi 162 fi
166} 163}
167 164
168verbose () 165verbose ()
169{ 166{
170 $ECHOE "verbose: $@" >>$TEST_SSH_LOGFILE 167 echo "verbose: $@" >>$TEST_SSH_LOGFILE
171 if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then 168 if [ "X$TEST_SSH_QUIET" != "Xyes" ]; then
172 $ECHOE "$@" 169 echo "$@"
173 fi 170 fi
174} 171}
175 172
176 173
177fail () 174fail ()
178{ 175{
179 $ECHOE "FAIL: $@" >>$TEST_SSH_LOGFILE 176 echo "FAIL: $@" >>$TEST_SSH_LOGFILE
180 RESULT=1 177 RESULT=1
181 $ECHOE "$@" 178 echo "$@"
182} 179}
183 180
184fatal () 181fatal ()
185{ 182{
186 $ECHOE "FATAL: $@" >>$TEST_SSH_LOGFILE 183 echo "FATAL: $@" >>$TEST_SSH_LOGFILE
187 echon "FATAL: " 184 echon "FATAL: "
188 fail "$@" 185 fail "$@"
189 cleanup 186 cleanup