diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | regress/sftp-glob.sh | 4 | ||||
-rw-r--r-- | regress/test-exec.sh | 19 |
3 files changed, 15 insertions, 14 deletions
@@ -73,6 +73,10 @@ | |||
73 | [regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh] | 73 | [regress/sftp-cmds.sh regress/sftp-glob.sh regress/test-exec.sh] |
74 | comprehensive tests for sftp escaping its interaction with globbing; | 74 | comprehensive tests for sftp escaping its interaction with globbing; |
75 | ok dtucker@ | 75 | ok dtucker@ |
76 | - djm@cvs.openbsd.org 2007/10/26 05:30:01 | ||
77 | [regress/sftp-glob.sh regress/test-exec.sh] | ||
78 | remove "echo -E" crap that I added in last commit and use printf(1) for | ||
79 | cases where we strictly require echo not to reprocess escape characters. | ||
76 | 80 | ||
77 | 20070927 | 81 | 20070927 |
78 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if | 82 | - (dtucker) [configure.ac atomicio.c] Fall back to including <sys/poll.h> if |
@@ -3344,4 +3348,4 @@ | |||
3344 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3348 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3345 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3349 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3346 | 3350 | ||
3347 | $Id: ChangeLog,v 1.4776 2007/10/26 04:54:12 djm Exp $ | 3351 | $Id: ChangeLog,v 1.4777 2007/10/26 05:35:54 djm Exp $ |
diff --git a/regress/sftp-glob.sh b/regress/sftp-glob.sh index d5ebf9fd6..62004efc5 100644 --- a/regress/sftp-glob.sh +++ b/regress/sftp-glob.sh | |||
@@ -1,4 +1,4 @@ | |||
1 | # $OpenBSD: sftp-glob.sh,v 1.2 2007/10/24 03:32:35 djm Exp $ | 1 | # $OpenBSD: sftp-glob.sh,v 1.3 2007/10/26 05:30:01 djm Exp $ |
2 | # Placed in the Public Domain. | 2 | # Placed in the Public Domain. |
3 | 3 | ||
4 | tid="sftp glob" | 4 | tid="sftp glob" |
@@ -9,7 +9,7 @@ sftp_ls() { | |||
9 | expected=$3 | 9 | expected=$3 |
10 | unexpected=$4 | 10 | unexpected=$4 |
11 | verbose "$tid: $errtag" | 11 | verbose "$tid: $errtag" |
12 | $ECHOE "ls -l ${target}" | \ | 12 | printf "ls -l %s" "${target}" | \ |
13 | ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \ | 13 | ${SFTP} -b - -P ${SFTPSERVER} 2>/dev/null | \ |
14 | grep -v "^sftp>" > ${RESULTS} | 14 | grep -v "^sftp>" > ${RESULTS} |
15 | if [ $? -ne 0 ]; then | 15 | if [ $? -ne 0 ]; then |
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` |
31 | fi | 31 | fi |
32 | 32 | ||
33 | # XXX platforms that don't support -E may need a replacement | ||
34 | ECHOE="echo -E" | ||
35 | |||
36 | OBJ=$1 | 33 | OBJ=$1 |
37 | if [ "x$OBJ" = "x" ]; then | 34 | if [ "x$OBJ" = "x" ]; then |
38 | echo '$OBJ not defined' | 35 | echo '$OBJ not defined' |
@@ -159,31 +156,31 @@ cleanup () | |||
159 | 156 | ||
160 | trace () | 157 | trace () |
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 | ||
168 | verbose () | 165 | verbose () |
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 | ||
177 | fail () | 174 | fail () |
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 | ||
184 | fatal () | 181 | fatal () |
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 |