aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJon Simons <jon@jonsimons.org>2014-10-13 03:06:39 -0700
committerAndreas Schneider <asn@cryptomilk.org>2014-10-15 10:26:24 +0200
commita25790d34388d4f71371655d21a38d283ad4d85e (patch)
treead6bdc904fbc22e52126a0e7363a71b1afe1c0b4 /tests
parentcd2dc3770a49fc4487cbb0625003983e43520ec7 (diff)
downloadlibssh-a25790d34388d4f71371655d21a38d283ad4d85e.tar.gz
libssh-a25790d34388d4f71371655d21a38d283ad4d85e.tar.xz
libssh-a25790d34388d4f71371655d21a38d283ad4d85e.zip
tests: fix pkd build breakages
Fix a build breakage when '-DWITH_SERVER=OFF' is set: skip building the pkd test for that case. Add some missing includes for the OpenIndiana and FreeBSD builds. Signed-off-by: Jon Simons <jon@jonsimons.org> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/pkd/CMakeLists.txt4
-rw-r--r--tests/pkd/pkd_daemon.c3
-rw-r--r--tests/pkd/pkd_util.c1
4 files changed, 9 insertions, 3 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index cba1d303..7cdb2c48 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -47,4 +47,6 @@ if (WITH_BENCHMARKS)
add_subdirectory(benchmarks)
endif (WITH_BENCHMARKS)
-add_subdirectory(pkd)
+if (WITH_SERVER)
+ add_subdirectory(pkd)
+endif (WITH_SERVER)
diff --git a/tests/pkd/CMakeLists.txt b/tests/pkd/CMakeLists.txt
index d4389595..515dae10 100644
--- a/tests/pkd/CMakeLists.txt
+++ b/tests/pkd/CMakeLists.txt
@@ -1,6 +1,6 @@
project(pkd C)
-if (UNIX AND NOT WIN32)
+if (WITH_SERVER AND UNIX AND NOT WIN32)
include_directories(
${LIBSSH_PUBLIC_INCLUDE_DIRS}
@@ -32,4 +32,4 @@ set(pkd_libs
add_executable(pkd_hello ${pkd_hello_src})
target_link_libraries(pkd_hello ${pkd_libs})
-endif (UNIX AND NOT WIN32)
+endif (WITH_SERVER AND UNIX AND NOT WIN32)
diff --git a/tests/pkd/pkd_daemon.c b/tests/pkd/pkd_daemon.c
index de4e5369..07736fa6 100644
--- a/tests/pkd/pkd_daemon.c
+++ b/tests/pkd/pkd_daemon.c
@@ -8,11 +8,14 @@
*/
#include <errno.h>
+#include <netinet/in.h>
#include <pthread.h>
#include <signal.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/types.h>
+#include <sys/socket.h>
#include <libssh/callbacks.h>
#include <libssh/libssh.h>
diff --git a/tests/pkd/pkd_util.c b/tests/pkd/pkd_util.c
index 95d3be65..963b58d6 100644
--- a/tests/pkd/pkd_util.c
+++ b/tests/pkd/pkd_util.c
@@ -7,6 +7,7 @@
#include <signal.h>
#include <stdio.h>
#include <stdlib.h>
+#include <sys/wait.h>
#include "pkd_client.h"
#include "pkd_util.h"