- (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]

Move the jot helper function to portable-specific part of test-exec.sh.
This commit is contained in:
Darren Tucker 2013-05-17 19:17:58 +10:00
parent 96457a54d0
commit 5f1a89a3b6
4 changed files with 8 additions and 8 deletions

View File

@ -78,6 +78,8 @@
- (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits. - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits.
- (dtucker) [regress/cfgmatch.sh] Resync config file setup with openbsd. - (dtucker) [regress/cfgmatch.sh] Resync config file setup with openbsd.
- (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd. - (dtucker) [regress/agent-getpeereid.sh] Resync spaces with openbsd.
- (dtucker) [regress/integrity.sh regress/krl.sh regress/test-exec.sh]
Move the jot helper function to portable-specific part of test-exec.sh.
20130516 20130516
- (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be

View File

@ -29,10 +29,6 @@ echo "KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1" \
# sshd-command for proxy (see test-exec.sh) # sshd-command for proxy (see test-exec.sh)
cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy" cmd="$SUDO sh ${SRC}/sshd-log-wrapper.sh ${SSHD} ${TEST_SSHD_LOGFILE} -i -f $OBJ/sshd_proxy"
jot() {
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
}
for m in $macs; do for m in $macs; do
trace "test $tid: mac $m" trace "test $tid: mac $m"
elen=0 elen=0

View File

@ -39,10 +39,6 @@ serial: 799
serial: 599-701 serial: 599-701
EOF EOF
jot() {
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
}
# A specification that revokes some certificated by key ID. # A specification that revokes some certificated by key ID.
touch $OBJ/revoked-keyid touch $OBJ/revoked-keyid
for n in 1 2 3 4 10 15 30 50 `jot 500 300` 999 1000 1001 1002; do for n in 1 2 3 4 10 15 30 50 `jot 500 300` 999 1000 1001 1002; do

View File

@ -177,6 +177,7 @@ rm -f ${COPY}
export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
#echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
# Portable specific functions
have_prog() have_prog()
{ {
saved_IFS="$IFS" saved_IFS="$IFS"
@ -192,6 +193,11 @@ have_prog()
return 1 return 1
} }
jot() {
awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
}
# End of portable specific functions
cleanup () cleanup ()
{ {
if [ -f $PIDFILE ]; then if [ -f $PIDFILE ]; then