From d1e26cf391de31128b4edde118bff5fed98a90ea Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 25 Jul 2013 12:11:18 +1000
Subject: [PATCH]    - djm@cvs.openbsd.org 2013/06/21 02:26:26     
 [regress/sftp-cmds.sh regress/test-exec.sh]      unbreak sftp-cmds for
 renamed test data (s/ls/data/)

---
 ChangeLog            |  3 +++
 regress/sftp-cmds.sh | 10 +++++-----
 regress/test-exec.sh |  5 +++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 841988bb6..9ba325874 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@
    - dtucker@cvs.openbsd.org 2013/06/10 21:56:43
      [regress/forwarding.sh]
      Add test for forward config parsing
+   - djm@cvs.openbsd.org 2013/06/21 02:26:26
+     [regress/sftp-cmds.sh regress/test-exec.sh]
+     unbreak sftp-cmds for renamed test data (s/ls/data/)
 
 20130720
  - (djm) OpenBSD CVS Sync
diff --git a/regress/sftp-cmds.sh b/regress/sftp-cmds.sh
index ba5ef066d..aad7fcac2 100644
--- a/regress/sftp-cmds.sh
+++ b/regress/sftp-cmds.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: sftp-cmds.sh,v 1.13 2013/05/17 04:29:14 dtucker Exp $
+#	$OpenBSD: sftp-cmds.sh,v 1.14 2013/06/21 02:26:26 djm Exp $
 #	Placed in the Public Domain.
 
 # XXX - TODO: 
@@ -106,7 +106,7 @@ rm -f ${COPY}.dd/*
 verbose "$tid: get to directory"
 echo "get $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "get failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get"
+cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after get"
 
 rm -f ${COPY}.dd/*
 verbose "$tid: glob get to directory"
@@ -120,7 +120,7 @@ rm -f ${COPY}.dd/*
 verbose "$tid: get to local dir"
 (echo "lcd ${COPY}.dd"; echo "get $DATA" ) | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
         || fail "get failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after get"
+cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after get"
 
 rm -f ${COPY}.dd/*
 verbose "$tid: glob get to local dir"
@@ -154,7 +154,7 @@ rm -f ${COPY}.dd/*
 verbose "$tid: put to directory"
 echo "put $DATA ${COPY}.dd" | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
 	|| fail "put failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put"
+cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after put"
 
 rm -f ${COPY}.dd/*
 verbose "$tid: glob put to directory"
@@ -168,7 +168,7 @@ rm -f ${COPY}.dd/*
 verbose "$tid: put to local dir"
 (echo "cd ${COPY}.dd"; echo "put $DATA") | ${SFTP} -D ${SFTPSERVER} >/dev/null 2>&1 \
 	|| fail "put failed"
-cmp $DATA ${COPY}.dd/`basename $DATA` || fail "corrupted copy after put"
+cmp $DATA ${COPY}.dd/$DATANAME || fail "corrupted copy after put"
 
 rm -f ${COPY}.dd/*
 verbose "$tid: glob put to local dir"
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 6e1c28c87..eee446264 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -1,4 +1,4 @@
-#	$OpenBSD: test-exec.sh,v 1.45 2013/05/30 20:12:32 dtucker Exp $
+#	$OpenBSD: test-exec.sh,v 1.46 2013/06/21 02:26:26 djm Exp $
 #	Placed in the Public Domain.
 
 #SUDO=sudo
@@ -167,7 +167,8 @@ SSH="$SSHLOGWRAP"
 # Some test data.  We make a copy because some tests will overwrite it.
 # The tests may assume that $DATA exists and is writable and $COPY does
 # not exist.
-DATA=$OBJ/data
+DATANAME=data
+DATA=$OBJ/${DATANAME}
 cat $SSHD $SSHD $SSHD $SSHD >${DATA}
 chmod u+w ${DATA}
 COPY=$OBJ/copy