diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2019-11-06 18:44:21 +0100 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2019-11-07 16:14:46 +0100 |
| commit | cc190b21b286b44ffdb0743c7aa3c37b63c2d008 (patch) | |
| tree | 8c9acab41954354dae4419df255d1f0a7bab6ef1 | |
| parent | a775324c35a1616e87d8cec46158fbeaec3ccb9b (diff) | |
| download | libssh-cc190b21b286b44ffdb0743c7aa3c37b63c2d008.tar.gz libssh-cc190b21b286b44ffdb0743c7aa3c37b63c2d008.tar.xz libssh-cc190b21b286b44ffdb0743c7aa3c37b63c2d008.zip | |
cmake: Fix setting up cwrap for server testing
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
(cherry picked from commit ea4f71721fc40651519942348c3d6f74e47af948)
| -rw-r--r-- | tests/CMakeLists.txt | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1df0010e..a338af44 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -43,7 +43,7 @@ set(TEST_TARGET_LIBRARIES add_subdirectory(unittests) -if (CLIENT_TESTING) +if (CLIENT_TESTING OR SERVER_TESTING) find_package(socket_wrapper 1.1.5 REQUIRED) find_package(nss_wrapper 1.1.2 REQUIRED) find_package(uid_wrapper 1.2.0 REQUIRED) @@ -135,18 +135,20 @@ if (CLIENT_TESTING) file(COPY keys/certauth/id_rsa-cert.pub DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/home/bob/.ssh_cert/ FILE_PERMISSIONS OWNER_READ OWNER_WRITE) message(STATUS "TORTURE_ENVIRONMENT=${TORTURE_ENVIRONMENT}") - - add_subdirectory(client) -endif (CLIENT_TESTING) +endif () if (WITH_BENCHMARKS) add_subdirectory(benchmarks) -endif (WITH_BENCHMARKS) +endif () + +if (CLIENT_TESTING) + add_subdirectory(client) +endif () if (WITH_SERVER AND SERVER_TESTING) add_subdirectory(pkd) add_subdirectory(server) -endif (WITH_SERVER AND SERVER_TESTING) +endif () if (FUZZ_TESTING) add_subdirectory(fuzz) |