summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2015-01-20 00:11:31 +0100
committerDamien Miller <djm@mindrot.org>2015-01-20 00:11:31 +0100
commit1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1 (patch)
tree9b29e30a98d629f853138751db04eb33c26ab3ba
parentupstream commit (diff)
downloadopenssh-1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1.tar.xz
openssh-1ca3e2155aa5d3801a7ae050f85c71f41fcb95b1.zip
fix kex test
Diffstat (limited to '')
-rw-r--r--Makefile.in9
-rw-r--r--regress/unittests/kex/test_kex.c2
-rw-r--r--regress/unittests/kex/tests.c2
3 files changed, 7 insertions, 6 deletions
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);