aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorAndreas Schneider <asn@cryptomilk.org>2012-10-07 11:10:27 +0200
committerAndreas Schneider <asn@cryptomilk.org>2012-10-07 11:10:27 +0200
commitc81010e2f7e560081d78d15e54789af45c0a4999 (patch)
treebd38f40fe2a56388f1373454d72f8186aa003b25 /tests
parentc078e36219fc23aed8fff9b5efce33e09e177e20 (diff)
downloadlibssh-c81010e2f7e560081d78d15e54789af45c0a4999.tar.gz
libssh-c81010e2f7e560081d78d15e54789af45c0a4999.tar.xz
libssh-c81010e2f7e560081d78d15e54789af45c0a4999.zip
test: Use cmocka instead of cmockery.
cmocka is the successor of cmockery. http://git.cryptomilk.org/projects/cmocka.git/
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt6
-rw-r--r--tests/client/CMakeLists.txt14
-rw-r--r--tests/torture.h2
-rw-r--r--tests/unittests/CMakeLists.txt20
4 files changed, 21 insertions, 21 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6942bacb..bb39755a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ set(TORTURE_LIBRARY torture)
include_directories(
${LIBSSH_PUBLIC_INCLUDE_DIRS}
- ${CMOCKERY_INCLUDE_DIR}
+ ${CMOCKA_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIRS}
${GCRYPT_INCLUDE_DIRS}
${ZLIB_INCLUDE_DIRS}
@@ -20,7 +20,7 @@ include_directories(
# create test library
add_library(${TORTURE_LIBRARY} STATIC cmdline.c torture.c)
target_link_libraries(${TORTURE_LIBRARY}
- ${CMOCKERY_LIBRARY}
+ ${CMOCKA_LIBRARY}
${LIBSSH_STATIC_LIBRARY}
${LIBSSH_LINK_LIBRARIES}
${LIBSSH_THREADS_STATIC_LIBRARY}
@@ -30,7 +30,7 @@ target_link_libraries(${TORTURE_LIBRARY}
set(TEST_TARGET_LIBRARIES
${TORTURE_LIBRARY}
- ${CMOCKERY_LIBRARY}
+ ${CMOCKA_LIBRARY}
${LIBSSH_STATIC_LIBRARY}
${LIBSSH_LINK_LIBRARIES}
${LIBSSH_THREADS_STATIC_LIBRARY}
diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index cfce09ea..d8a58602 100644
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -1,11 +1,11 @@
project(clienttests C)
-add_cmockery_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_connect torture_connect.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_algorithms torture_algorithms.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_auth torture_auth.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_connect torture_connect.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_knownhosts torture_knownhosts.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_proxycommand torture_proxycommand.c ${TORTURE_LIBRARY})
if (WITH_SFTP)
- add_cmockery_test(torture_sftp_static torture_sftp_static.c ${TORTURE_LIBRARY})
- add_cmockery_test(torture_sftp_dir torture_sftp_dir.c ${TORTURE_LIBRARY})
+ add_cmocka_test(torture_sftp_static torture_sftp_static.c ${TORTURE_LIBRARY})
+ add_cmocka_test(torture_sftp_dir torture_sftp_dir.c ${TORTURE_LIBRARY})
endif (WITH_SFTP)
diff --git a/tests/torture.h b/tests/torture.h
index b9cbf9eb..dbc1906a 100644
--- a/tests/torture.h
+++ b/tests/torture.h
@@ -37,7 +37,7 @@
#include "libssh/priv.h"
#include "libssh/sftp.h"
-#include <google/cmockery.h>
+#include <cmocka.h>
/* Used by main to communicate with parse_opt. */
struct argument_s {
diff --git a/tests/unittests/CMakeLists.txt b/tests/unittests/CMakeLists.txt
index 91e1c41e..d8a6125f 100644
--- a/tests/unittests/CMakeLists.txt
+++ b/tests/unittests/CMakeLists.txt
@@ -1,16 +1,16 @@
project(unittests C)
-add_cmockery_test(torture_buffer torture_buffer.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_callbacks torture_callbacks.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_init torture_init.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_list torture_list.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_misc torture_misc.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_options torture_options.c ${TORTURE_LIBRARY})
-add_cmockery_test(torture_isipaddr torture_isipaddr.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_buffer torture_buffer.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_callbacks torture_callbacks.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_init torture_init.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_list torture_list.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_misc torture_misc.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_options torture_options.c ${TORTURE_LIBRARY})
+add_cmocka_test(torture_isipaddr torture_isipaddr.c ${TORTURE_LIBRARY})
if (UNIX AND NOT WIN32)
# requires ssh-keygen
- add_cmockery_test(torture_keyfiles torture_keyfiles.c ${TORTURE_LIBRARY})
- add_cmockery_test(torture_pki torture_pki.c ${TORTURE_LIBRARY})
+ add_cmocka_test(torture_keyfiles torture_keyfiles.c ${TORTURE_LIBRARY})
+ add_cmocka_test(torture_pki torture_pki.c ${TORTURE_LIBRARY})
# requires pthread
- add_cmockery_test(torture_rand torture_rand.c ${TORTURE_LIBRARY})
+ add_cmocka_test(torture_rand torture_rand.c ${TORTURE_LIBRARY})
endif (UNIX AND NOT WIN32)