mirror of
https://git.libssh.org/projects/libssh.git
synced 2026-02-10 18:28:10 +09:00
tests: Wait for the server to start
The previous timeout of 500 ms was not enough on slower machines or
while running the tests under valgrind. On much faster machines the
sleep() was bringing unnecessary overhead.
This method opens simple connection to the server verifying it is ready
to accept the connection from the test for 5 seconds. It the server
does not start until then, it fails the tests during initialization,
rather than leaving the cases to run against missing server.
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit c15ad753a7)
This commit is contained in:
committed by
Andreas Schneider
parent
83f6ce0928
commit
129744692c
@@ -31,6 +31,9 @@ add_library(${TORTURE_LIBRARY}
|
||||
torture_pki.c
|
||||
torture_cmocka.c)
|
||||
target_link_libraries(${TORTURE_LIBRARY} ${TORTURE_LINK_LIBRARIES})
|
||||
target_compile_options(${TORTURE_LIBRARY} PRIVATE
|
||||
-DSSH_PING_EXECUTABLE="${CMAKE_CURRENT_BINARY_DIR}/ssh_ping"
|
||||
)
|
||||
|
||||
if (ARGP_LIBRARY)
|
||||
target_link_libraries(${TORTURE_LIBRARY}
|
||||
@@ -87,6 +90,11 @@ if (CLIENT_TESTING)
|
||||
chroot_wrapper
|
||||
)
|
||||
|
||||
# ssh_ping
|
||||
add_executable(ssh_ping ssh_ping.c)
|
||||
target_compile_options(ssh_ping PRIVATE ${DEFAULT_C_COMPILE_FLAGS})
|
||||
target_link_libraries(ssh_ping ${LIBSSH_SHARED_LIBRARY})
|
||||
|
||||
# homedir will be used in passwd
|
||||
set(HOMEDIR ${CMAKE_CURRENT_BINARY_DIR}/home)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user