From e0775fa3933ad7724a402bb96c6e0096bd2cca09 Mon Sep 17 00:00:00 2001
From: Markus Friedl <mfriedl@gmail.com>
Date: Thu, 5 Jan 2012 12:21:26 +0100
Subject: [PATCH] step into subdirs and use in-tree executables for regression
 tests.

---
 Makefile         |  5 +++++
 regress/Makefile | 11 +++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..f5e0053
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,5 @@
+#	$OpenBSD:$
+
+SUBDIR=	ssh regress
+
+.include <bsd.subdir.mk>
diff --git a/regress/Makefile b/regress/Makefile
index e2db094..e0afb46 100644
--- a/regress/Makefile
+++ b/regress/Makefile
@@ -71,6 +71,17 @@ CLEANFILES+=	authorized_keys_${USER} known_hosts pidfile \
 # Enable all malloc(3) randomisations and checks
 TEST_ENV=      "MALLOC_OPTIONS=AFGJPRX"
 
+# use in-tree executables
+TEST_ENV+=	"TEST_SSH_SCP=${.CURDIR}/../ssh/scp/obj/scp"
+TEST_ENV+=	"TEST_SSH_SFTP=${.CURDIR}/../ssh/sftp/obj/sftp"
+TEST_ENV+=	"TEST_SSH_SFTPSERVER=${.CURDIR}/../ssh/sftp-server/obj/sftp-server"
+TEST_ENV+=	"TEST_SSH_SSH=${.CURDIR}/../ssh/ssh/obj/ssh"
+TEST_ENV+=	"TEST_SSH_SSHADD=${.CURDIR}/../ssh/ssh-add/obj/ssh-add"
+TEST_ENV+=	"TEST_SSH_SSHAGENT=${.CURDIR}/../ssh/ssh-agent/obj/ssh-agent"
+TEST_ENV+=	"TEST_SSH_SSHD=${.CURDIR}/../ssh/sshd/obj/sshd"
+TEST_ENV+=	"TEST_SSH_SSHKEYGEN=${.CURDIR}/../ssh/ssh-keygen/obj/ssh-keygen"
+TEST_ENV+=	"TEST_SSH_SSHKEYSCAN=${.CURDIR}/../ssh/ssh-keyscan/obj/ssh-keyscan"
+
 t1:
 	ssh-keygen -if ${.CURDIR}/rsa_ssh2.prv | diff - ${.CURDIR}/rsa_openssh.prv
 	tr '\n' '\r' <${.CURDIR}/rsa_ssh2.prv > ${.OBJDIR}/rsa_ssh2_cr.prv