From 5f1a89a3b67264f4aa83e057cd4f74fd60b9ffa4 Mon Sep 17 00:00:00 2001
From: Darren Tucker <dtucker@zip.com.au>
Date: Fri, 17 May 2013 19:17:58 +1000
Subject:  - (dtucker) [regress/integrity.sh regress/krl.sh
 regress/test-exec.sh]    Move the jot helper function to portable-specific
 part of test-exec.sh.

---
 ChangeLog            | 2 ++
 regress/integrity.sh | 4 ----
 regress/krl.sh       | 4 ----
 regress/test-exec.sh | 6 ++++++
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b02acb2d9..620a635f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -78,6 +78,8 @@
  - (dtucker) [openbsd-compat/getopt.h] Remove unneeded bits.
  - (dtucker) [regress/cfgmatch.sh] Resync config file setup 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
  - (djm) [contrib/ssh-copy-id] Fix bug that could cause "rm *" to be 
diff --git a/regress/integrity.sh b/regress/integrity.sh
index 982eced21..1d17fe10a 100644
--- a/regress/integrity.sh
+++ b/regress/integrity.sh
@@ -29,10 +29,6 @@ echo "KexAlgorithms diffie-hellman-group14-sha1,diffie-hellman-group1-sha1" \
 # 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"
 
-jot() {
-	awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
-}
-
 for m in $macs; do
 	trace "test $tid: mac $m"
 	elen=0
diff --git a/regress/krl.sh b/regress/krl.sh
index 62a239c38..de9cc8764 100644
--- a/regress/krl.sh
+++ b/regress/krl.sh
@@ -39,10 +39,6 @@ serial: 799
 serial: 599-701
 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.
 touch $OBJ/revoked-keyid
 for n in 1 2 3 4 10 15 30 50 `jot 500 300` 999 1000 1001 1002; do
diff --git a/regress/test-exec.sh b/regress/test-exec.sh
index 599b8d9ba..910ed4f70 100644
--- a/regress/test-exec.sh
+++ b/regress/test-exec.sh
@@ -177,6 +177,7 @@ rm -f ${COPY}
 export SSH SSHD SSHAGENT SSHADD SSHKEYGEN SSHKEYSCAN SFTP SFTPSERVER SCP
 #echo $SSH $SSHD $SSHAGENT $SSHADD $SSHKEYGEN $SSHKEYSCAN $SFTP $SFTPSERVER $SCP
 
+# Portable specific functions
 have_prog()
 {
 	saved_IFS="$IFS"
@@ -192,6 +193,11 @@ have_prog()
 	return 1
 }
 
+jot() {
+	awk "BEGIN { for (i = $2; i < $2 + $1; i++) { printf \"%d\n\", i } exit }"
+}
+# End of portable specific functions
+
 cleanup ()
 {
 	if [ -f $PIDFILE ]; then
-- 
cgit v1.2.3