aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DefineOptions.cmake2
-rw-r--r--tests/CMakeLists.txt3
-rw-r--r--tests/client/CMakeLists.txt4
-rw-r--r--tests/client/torture_algorithms.c (renamed from tests/unittests/torture_algorithms.c)0
-rw-r--r--tests/client/torture_auth.c (renamed from tests/unittests/torture_auth.c)0
-rw-r--r--tests/unittests/CMakeLists.txt2
6 files changed, 8 insertions, 3 deletions
diff --git a/DefineOptions.cmake b/DefineOptions.cmake
index f7a5244..3d9dc64 100644
--- a/DefineOptions.cmake
+++ b/DefineOptions.cmake
@@ -9,7 +9,7 @@ option(WITH_GCRYPT "Compile against libgcrypt" OFF)
option(WITH_PCAP "Compile with Pcap generation support" ON)
option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF)
option(WITH_TESTING "Build with unit tests" OFF)
+option(WITH_CLIENT_TESTING "Build with client tests; requires a running sshd" OFF)
if (WITH_TESTING)
set(WITH_STATIC_LIB ON)
endif (WITH_TESTING)
-
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 817d3a7..2998663 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,3 +17,6 @@ target_link_libraries(${TORTURE_LIBRARY} ${CHECK_LIBRARIES} ${LIBSSH_STATIC_LIBR
set(TEST_TARGET_LIBRARIES ${SUPPORT_LIBRARY} ${LIBSSH_LINK_LIBRARIES})
add_subdirectory(unittests)
+if (WITH_CLIENT_TESTING)
+ add_subdirectory(client)
+endif (WITH_CLIENT_TESTING)
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
new file mode 100644
index 0000000..b92f08e
--- /dev/null
+++ b/tests/client/CMakeLists.txt
@@ -0,0 +1,4 @@
+project(clienttests C)
+
+add_check_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
+add_check_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
diff --git a/tests/unittests/torture_algorithms.c b/tests/client/torture_algorithms.c
index 300fe05..300fe05 100644
--- a/tests/unittests/torture_algorithms.c
+++ b/tests/client/torture_algorithms.c
diff --git a/tests/unittests/torture_auth.c b/tests/client/torture_auth.c
index 2381d8a..2381d8a 100644
--- a/tests/unittests/torture_auth.c
+++ b/tests/client/torture_auth.c
diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
index 3ac043c..8eb7d29 100644
--- a/tests/unittests/CMakeLists.txt
+++ b/tests/unittests/CMakeLists.txt
@@ -1,10 +1,8 @@
project(unittests C)
-add_check_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
add_check_test(torture_init torture_init.c ${TORTURE_LIBRARY})
add_check_test(torture_list torture_list.c ${TORTURE_LIBRARY})
add_check_test(torture_misc torture_misc.c ${TORTURE_LIBRARY})
-add_check_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
add_check_test(torture_keyfiles torture_keyfiles.c ${TORTURE_LIBRARY})
add_check_test(torture_options torture_options.c ${TORTURE_LIBRARY})
add_check_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})