| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Adjust test cases to work with busybox. |
| 2 | |
| 3 | - Replace dd parameter "obs" with "bs". |
| 4 | - Replace "head -<num>" with "head -n <num>". |
| 5 | |
| 6 | Signed-off-by: Maxin B. John <maxin.john@enea.com> |
| 7 | Upstream-Status: Pending |
| 8 | |
| 9 | Index: openssh-6.8p1/regress/cipher-speed.sh |
| 10 | =================================================================== |
| 11 | --- openssh-6.8p1.orig/regress/cipher-speed.sh |
| 12 | +++ openssh-6.8p1/regress/cipher-speed.sh |
| 13 | @@ -17,7 +17,7 @@ for c in `${SSH} -Q cipher`; do n=0; for |
| 14 | printf "%-60s" "$c/$m:" |
| 15 | ( ${SSH} -o 'compression no' \ |
| 16 | -F $OBJ/ssh_proxy -2 -m $m -c $c somehost \ |
| 17 | - exec sh -c \'"dd of=/dev/null obs=32k"\' \ |
| 18 | + exec sh -c \'"dd of=/dev/null bs=32k"\' \ |
| 19 | < ${DATA} ) 2>&1 | getbytes |
| 20 | |
| 21 | if [ $? -ne 0 ]; then |
| 22 | @@ -42,7 +42,7 @@ for c in $ciphers; do |
| 23 | printf "%-60s" "$c:" |
| 24 | ( ${SSH} -o 'compression no' \ |
| 25 | -F $OBJ/ssh_proxy -1 -c $c somehost \ |
| 26 | - exec sh -c \'"dd of=/dev/null obs=32k"\' \ |
| 27 | + exec sh -c \'"dd of=/dev/null bs=32k"\' \ |
| 28 | < ${DATA} ) 2>&1 | getbytes |
| 29 | if [ $? -ne 0 ]; then |
| 30 | fail "ssh -1 failed with cipher $c" |
| 31 | Index: openssh-6.8p1/regress/transfer.sh |
| 32 | =================================================================== |
| 33 | --- openssh-6.8p1.orig/regress/transfer.sh |
| 34 | +++ openssh-6.8p1/regress/transfer.sh |
| 35 | @@ -15,7 +15,7 @@ for p in ${SSH_PROTOCOLS}; do |
| 36 | for s in 10 100 1k 32k 64k 128k 256k; do |
| 37 | trace "proto $p dd-size ${s}" |
| 38 | rm -f ${COPY} |
| 39 | - dd if=$DATA obs=${s} 2> /dev/null | \ |
| 40 | + dd if=$DATA bs=${s} 2> /dev/null | \ |
| 41 | ${SSH} -q -$p -F $OBJ/ssh_proxy somehost "cat > ${COPY}" |
| 42 | if [ $? -ne 0 ]; then |
| 43 | fail "ssh cat $DATA failed" |
| 44 | Index: openssh-6.8p1/regress/yes-head.sh |
| 45 | =================================================================== |
| 46 | --- openssh-6.8p1.orig/regress/yes-head.sh |
| 47 | +++ openssh-6.8p1/regress/yes-head.sh |
| 48 | @@ -4,7 +4,7 @@ |
| 49 | tid="yes pipe head" |
| 50 | |
| 51 | for p in ${SSH_PROTOCOLS}; do |
| 52 | - lines=`${SSH} -$p -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | _POSIX2_VERSION=199209 head -2000"' | (sleep 3 ; wc -l)` |
| 53 | + lines=`${SSH} -$p -F $OBJ/ssh_proxy thishost 'sh -c "while true;do echo yes;done | _POSIX2_VERSION=199209 head -n 2000"' | (sleep 3 ; wc -l)` |
| 54 | if [ $? -ne 0 ]; then |
| 55 | fail "yes|head test failed" |
| 56 | lines = 0; |
| 57 | Index: openssh-6.8p1/regress/key-options.sh |
| 58 | =================================================================== |
| 59 | --- openssh-6.8p1.orig/regress/key-options.sh |
| 60 | +++ openssh-6.8p1/regress/key-options.sh |
| 61 | @@ -54,7 +54,7 @@ for p in ${SSH_PROTOCOLS}; do |
| 62 | fi |
| 63 | |
| 64 | sed 's/.*/from="'"$f"'" &/' $origkeys >$authkeys |
| 65 | - from=`head -1 $authkeys | cut -f1 -d ' '` |
| 66 | + from=`head -n 1 $authkeys | cut -f1 -d ' '` |
| 67 | verbose "key option proto $p $from" |
| 68 | r=`${SSH} -$p -q -F $OBJ/ssh_proxy somehost 'echo true'` |
| 69 | if [ "$r" = "true" ]; then |