From 9e06a0fb23ec55d9223b26a45bb63c7649e2f2f2 Mon Sep 17 00:00:00 2001
From: "markus@openbsd.org" <markus@openbsd.org>
Date: Thu, 15 Jan 2015 23:41:29 +0000
Subject: upstream commit

add kex unit tests
---
 regress/unittests/kex/tests.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 regress/unittests/kex/tests.c

(limited to 'regress/unittests/kex/tests.c')

diff --git a/regress/unittests/kex/tests.c b/regress/unittests/kex/tests.c
new file mode 100644
index 000000000..1e519fe4b
--- /dev/null
+++ b/regress/unittests/kex/tests.c
@@ -0,0 +1,14 @@
+/* 	$OpenBSD: tests.c,v 1.1 2015/01/15 23:41:29 markus Exp $ */
+/*
+ * Placed in the public domain
+ */
+
+#include "test_helper.h"
+
+void kex_tests(void);
+
+void
+tests(void)
+{
+	kex_tests();
+}
-- 
cgit v1.2.3


From 1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1 Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Tue, 20 Jan 2015 10:11:31 +1100
Subject: fix kex test

---
 Makefile.in                      | 9 +++++----
 regress/unittests/kex/test_kex.c | 2 +-
 regress/unittests/kex/tests.c    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'regress/unittests/kex/tests.c')

diff --git a/Makefile.in b/Makefile.in
index 52592bbb6..5119d6a30 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -498,13 +498,14 @@ regress/unittests/bitmap/test_bitmap$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
 	    regress/unittests/test_helper/libtest_helper.a \
 	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
-UNITTESTS_TEST_BITMAP_OBJS=\
+UNITTESTS_TEST_KEX_OBJS=\
 	regress/unittests/kex/tests.o \
-	regress/unittests/kex/test_kex.o
+	regress/unittests/kex/test_kex.o \
+	roaming_dummy.o
 
-regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_BITMAP_OBJS} \
+regress/unittests/kex/test_kex$(EXEEXT): ${UNITTESTS_TEST_KEX_OBJS} \
     regress/unittests/test_helper/libtest_helper.a libssh.a
-	$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_BITMAP_OBJS) \
+	$(LD) -o $@ $(LDFLAGS) $(UNITTESTS_TEST_KEX_OBJS) \
 	    regress/unittests/test_helper/libtest_helper.a \
 	    -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)
 
diff --git a/regress/unittests/kex/test_kex.c b/regress/unittests/kex/test_kex.c
index e90647763..72a11f2c6 100644
--- a/regress/unittests/kex/test_kex.c
+++ b/regress/unittests/kex/test_kex.c
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "test_helper.h"
+#include "../test_helper/test_helper.h"
 
 #include "ssherr.h"
 #include "ssh_api.h"
diff --git a/regress/unittests/kex/tests.c b/regress/unittests/kex/tests.c
index 1e519fe4b..e7036ec17 100644
--- a/regress/unittests/kex/tests.c
+++ b/regress/unittests/kex/tests.c
@@ -3,7 +3,7 @@
  * Placed in the public domain
  */
 
-#include "test_helper.h"
+#include "../test_helper/test_helper.h"
 
 void kex_tests(void);
 
-- 
cgit v1.2.3