From c81010e2f7e560081d78d15e54789af45c0a4999 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Sun, 7 Oct 2012 11:10:27 +0200
Subject: test: Use cmocka instead of cmockery.

cmocka is the successor of cmockery.

http://git.cryptomilk.org/projects/cmocka.git/
---
 tests/CMakeLists.txt           |  6 +++---
 tests/client/CMakeLists.txt    | 14 +++++++-------
 tests/torture.h                |  2 +-
 tests/unittests/CMakeLists.txt | 20 ++++++++++----------
 4 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'tests')

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6942bac..bb39755 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 cfce09e..d8a5860 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 b9cbf9e..dbc1906 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 91e1c41..d8a6125 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)
-- 
cgit