Change in openvpn[release/2.6]: tests/unit_tests: Port to cmocka 2.0.0 API
A message that is not in the archive (sent off-list or not yet received): gerrit.1767876064000.Ifb6594700db71d219643a29c581099c778bcbbc6@...2715...
Attention is currently required from: cron2, plaisthos.
Hello plaisthos,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email
to review the following change.
Change subject: tests/unit_tests: Port to cmocka 2.0.0 API
......................................................................
tests/unit_tests: Port to cmocka 2.0.0 API
But add compat layer so that we can still build
against older versions of cmocka. Mostly this is
trivial but the custom check function changed its
prototype, so that requires some more work.
This backport commit additionally includes the fix for test_tls_crypt from commit 6246f2113f6e1fda13bca8de863dd5cc396ab6ef since the other test fixes from the original commit are not relevant to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1449
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35144.html
---
M CMakeLists.txt
M config.h.cmake.in
M configure.ac
M tests/unit_tests/openvpn/test_common.h
M tests/unit_tests/openvpn/test_tls_crypt.c
5 files changed, 49 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/62/1462/1
CMakeLists.txt +12 -8
@@ -291,6 +291,18 @@ ) set(HAVE_CONFIG_VERSION_H YES) +if (BUILD_TESTING) + find_package(cmocka CONFIG) + if (TARGET cmocka::cmocka) + set(CMOCKA_LIBRARIES cmocka::cmocka) + else () + pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) + set(CMOCKA_LIBRARIES PkgConfig::cmocka) + endif () + set(CMAKE_REQUIRED_LIBRARIES ${CMOCKA_LIBRARIES}) + check_include_files(cmocka_version.h HAVE_CMOCKA_VERSION_H) +endif () + configure_file(config.h.cmake.in config.h) configure_file(include/openvpn-plugin.h.in openvpn-plugin.h) # TODO we should remove the need for this, and always include config.h
@@ -541,14 +553,6 @@ if (BUILD_TESTING) - find_package(cmocka CONFIG) - if (TARGET cmocka::cmocka) - set(CMOCKA_LIBRARIES cmocka::cmocka) - else () - pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) - set(CMOCKA_LIBRARIES PkgConfig::cmocka) - endif () - set(unit_tests "test_auth_token" "test_buffer"
config.h.cmake.in +3 -0
@@ -86,6 +86,9 @@ /* git version information in config-version.h */ #cmakedefine HAVE_CONFIG_VERSION_H +/* cmocka version information available in cmocka_version.h (>= 2.0.0) */ +#cmakedefine HAVE_CMOCKA_VERSION_H + /* Define to 1 if you have the `daemon' function. */ #cmakedefine HAVE_DAEMON
configure.ac +10 -1
@@ -1525,7 +1525,16 @@ [have_cmocka="yes"], [AC_MSG_WARN([cmocka.pc not found on the system using pkg-config ${pkg_config_found}. Unit tests disabled])] ) -AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes" ]) +AM_CONDITIONAL([ENABLE_UNITTESTS], [false]) +if test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes"; then + AM_CONDITIONAL([ENABLE_UNITTESTS], [true]) + + saved_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${CMOCKA_CFLAGS}" + # detect cmocka < 2.0.0 that had no cmocka_version.h + AC_CHECK_HEADERS([cmocka_version.h]) + CFLAGS="${saved_CFLAGS}" +fi AC_SUBST([ENABLE_UNITTESTS]) TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS}"
tests/unit_tests/openvpn/test_common.h +21 -0
@@ -25,6 +25,27 @@#include <setjmp.h> #include <cmocka.h> +/* Do we use cmocka < 2.0.0? */ +#ifndef HAVE_CMOCKA_VERSION_H +#define HAVE_OLD_CMOCKA_API 1 +/* compat with various versions of cmocka.h +* Older versions have LargestIntegralType. Newer +* versions use uintmax_t. But LargestIntegralType +* is not guaranteed to be equal to uintmax_t, so +* we can't use that unconditionally. So we only use +* it if cmocka.h does not define LargestIntegralType. +*/ +#ifndef LargestIntegralType +#define LargestIntegralType uintmax_t +#endif +/* redefine 2.x API in terms of 1.x API */ +#define CMockaValueData LargestIntegralType +#define check_expected_uint check_expected +#define expect_uint_value expect_value +#define expect_check_data expect_check +#define cast_ptr_to_cmocka_value (x) (x) +#endif +/** * Sets up the environment for unit tests like making both stderr and stdout * non-buffered to avoid messages getting lost if the program exits early.
tests/unit_tests/openvpn/test_tls_crypt.c +3 -3
@@ -112,8 +112,8 @@ __wrap_buffer_write_file(const char *filename, const struct buffer *buf) { const char *pem = BSTR(buf); -check_expected (filename); -check_expected (pem); +check_expected_ptr (filename); +check_expected_ptr (pem);return mock_type (bool); }
@@ -121,7 +121,7 @@struct buffer __wrap_buffer_read_from_file (const char *filename,struct gc_arena *gc) { -check_expected (filename); +check_expected_ptr (filename); const char *pem_str = mock_ptr_type(const char *);struct buffer ret =alloc_buf_gc (strlen (pem_str) +1 , gc);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newchange
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ifb6594700db71d219643a29c581099c778bcbbc6
Gerrit-Change-Number: 1462
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: cron2 <[email protected]...>
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email )
Change subject: tests/unit_tests: Port to cmocka 2.0.0 API
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: comment
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ifb6594700db71d219643a29c581099c778bcbbc6
Gerrit-Change-Number: 1462
Gerrit-PatchSet: 1
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Thu, 15 Jan 2026 08:27:52 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
PATCH 1/1 tests/unit_tests: Port to cmocka 2.0.0 API
In reply to a message not in the archiveFrom: Frank Lichtenheld <[email protected]...>
But add compat layer so that we can still build
against older versions of cmocka. Mostly this is
trivial but the custom check function changed its
prototype, so that requires some more work.
This backport commit additionally includes the fix for test_tls_crypt from commit 6246f2113f6e1fda13bca8de863dd5cc396ab6ef since the other test fixes from the original commit are not relevant to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1449
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35144.html
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1462
(cherry picked from commit 6db186e0b1d9783ea96e8a945a47fd23b45e4778)
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1462
This mail reflects revision 1 of this Change.
Acked-by according to Gerrit (reflected above):
Gert Doering <[email protected]...>
CMakeLists.txt +12 -8
@@ -291,6 +291,18 @@ ) set(HAVE_CONFIG_VERSION_H YES) +if (BUILD_TESTING) + find_package(cmocka CONFIG) + if (TARGET cmocka::cmocka) + set(CMOCKA_LIBRARIES cmocka::cmocka) + else () + pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) + set(CMOCKA_LIBRARIES PkgConfig::cmocka) + endif () + set(CMAKE_REQUIRED_LIBRARIES ${CMOCKA_LIBRARIES}) + check_include_files(cmocka_version.h HAVE_CMOCKA_VERSION_H) +endif () + configure_file(config.h.cmake.in config.h) configure_file(include/openvpn-plugin.h.in openvpn-plugin.h) # TODO we should remove the need for this, and always include config.h
@@ -541,14 +553,6 @@ if (BUILD_TESTING) - find_package(cmocka CONFIG) - if (TARGET cmocka::cmocka) - set(CMOCKA_LIBRARIES cmocka::cmocka) - else () - pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) - set(CMOCKA_LIBRARIES PkgConfig::cmocka) - endif () - set(unit_tests "test_auth_token" "test_buffer"
config.h.cmake.in +3 -0
@@ -86,6 +86,9 @@ /* git version information in config-version.h */ #cmakedefine HAVE_CONFIG_VERSION_H +/* cmocka version information available in cmocka_version.h (>= 2.0.0) */ +#cmakedefine HAVE_CMOCKA_VERSION_H + /* Define to 1 if you have the `daemon' function. */ #cmakedefine HAVE_DAEMON
configure.ac +10 -1
@@ -1525,7 +1525,16 @@ [have_cmocka="yes"], [AC_MSG_WARN([cmocka.pc not found on the system using pkg-config ${pkg_config_found}. Unit tests disabled])] ) -AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes" ]) +AM_CONDITIONAL([ENABLE_UNITTESTS], [false]) +if test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes"; then + AM_CONDITIONAL([ENABLE_UNITTESTS], [true]) + + saved_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${CMOCKA_CFLAGS}" + # detect cmocka < 2.0.0 that had no cmocka_version.h + AC_CHECK_HEADERS([cmocka_version.h]) + CFLAGS="${saved_CFLAGS}" +fi AC_SUBST([ENABLE_UNITTESTS]) TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS}"
tests/unit_tests/openvpn/test_common.h +21 -0
@@ -25,6 +25,27 @@#include <setjmp.h> #include <cmocka.h> +/* Do we use cmocka < 2.0.0? */ +#ifndef HAVE_CMOCKA_VERSION_H +#define HAVE_OLD_CMOCKA_API 1 +/* compat with various versions of cmocka.h +* Older versions have LargestIntegralType. Newer +* versions use uintmax_t. But LargestIntegralType +* is not guaranteed to be equal to uintmax_t, so +* we can't use that unconditionally. So we only use +* it if cmocka.h does not define LargestIntegralType. +*/ +#ifndef LargestIntegralType +#define LargestIntegralType uintmax_t +#endif +/* redefine 2.x API in terms of 1.x API */ +#define CMockaValueData LargestIntegralType +#define check_expected_uint check_expected +#define expect_uint_value expect_value +#define expect_check_data expect_check +#define cast_ptr_to_cmocka_value (x) (x) +#endif +/** * Sets up the environment for unit tests like making both stderr and stdout * non-buffered to avoid messages getting lost if the program exits early.
tests/unit_tests/openvpn/test_tls_crypt.c +3 -3
@@ -112,8 +112,8 @@ __wrap_buffer_write_file(const char *filename, const struct buffer *buf) { const char *pem = BSTR(buf); -check_expected (filename); -check_expected (pem); +check_expected_ptr (filename); +check_expected_ptr (pem);return mock_type (bool); }
@@ -121,7 +121,7 @@struct buffer __wrap_buffer_read_from_file (const char *filename,struct gc_arena *gc) { -check_expected (filename); +check_expected_ptr (filename); const char *pem_str = mock_ptr_type(const char *);struct buffer ret =alloc_buf_gc (strlen (pem_str) +1 , gc);
[Openvpn-devel] [PATCH applied] Re: tests/unit_tests: Port to cmocka 2.0.0 API
This is the second part in the series - "cherrypick of fragments from master" (because we do not have all the affected unit tests in 2.6), still quite straightforward.
Your patch has been applied to the release/2.6 branch.
commit 78c39974527d0e6faa17fa853c41ea4858159b52
Author: Frank Lichtenheld Date: Thu Jan 15 09:28:12 2026 +0100
tests/unit_tests: Port to cmocka 2.0.0 API
Signed-off-by: Frank Lichtenheld <[email protected]...>
Signed-off-by: Gert Doering <[email protected]...>
Acked-by: Gert Doering <[email protected]...>
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1462
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35273.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#2) to the change originally created by flichtenheld. ( http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email )
The following approvals got outdated and were removed:
Code-Review+2 by cron2
Change subject: tests/unit_tests: Port to cmocka 2.0.0 API
......................................................................
tests/unit_tests: Port to cmocka 2.0.0 API
But add compat layer so that we can still build
against older versions of cmocka. Mostly this is
trivial but the custom check function changed its
prototype, so that requires some more work.
This backport commit additionally includes the fix for test_tls_crypt from commit 6246f2113f6e1fda13bca8de863dd5cc396ab6ef since the other test fixes from the original commit are not relevant to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1462
(cherry picked from commit 6db186e0b1d9783ea96e8a945a47fd23b45e4778)
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35273.html
---
M CMakeLists.txt
M config.h.cmake.in
M configure.ac
M tests/unit_tests/openvpn/test_common.h
M tests/unit_tests/openvpn/test_tls_crypt.c
5 files changed, 49 insertions(+), 12 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/62/1462/2
CMakeLists.txt +12 -8
@@ -291,6 +291,18 @@ ) set(HAVE_CONFIG_VERSION_H YES) +if (BUILD_TESTING) + find_package(cmocka CONFIG) + if (TARGET cmocka::cmocka) + set(CMOCKA_LIBRARIES cmocka::cmocka) + else () + pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) + set(CMOCKA_LIBRARIES PkgConfig::cmocka) + endif () + set(CMAKE_REQUIRED_LIBRARIES ${CMOCKA_LIBRARIES}) + check_include_files(cmocka_version.h HAVE_CMOCKA_VERSION_H) +endif () + configure_file(config.h.cmake.in config.h) configure_file(include/openvpn-plugin.h.in openvpn-plugin.h) # TODO we should remove the need for this, and always include config.h
@@ -541,14 +553,6 @@ if (BUILD_TESTING) - find_package(cmocka CONFIG) - if (TARGET cmocka::cmocka) - set(CMOCKA_LIBRARIES cmocka::cmocka) - else () - pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) - set(CMOCKA_LIBRARIES PkgConfig::cmocka) - endif () - set(unit_tests "test_auth_token" "test_buffer"
config.h.cmake.in +3 -0
@@ -86,6 +86,9 @@ /* git version information in config-version.h */ #cmakedefine HAVE_CONFIG_VERSION_H +/* cmocka version information available in cmocka_version.h (>= 2.0.0) */ +#cmakedefine HAVE_CMOCKA_VERSION_H + /* Define to 1 if you have the `daemon' function. */ #cmakedefine HAVE_DAEMON
configure.ac +10 -1
@@ -1525,7 +1525,16 @@ [have_cmocka="yes"], [AC_MSG_WARN([cmocka.pc not found on the system using pkg-config ${pkg_config_found}. Unit tests disabled])] ) -AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes" ]) +AM_CONDITIONAL([ENABLE_UNITTESTS], [false]) +if test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes"; then + AM_CONDITIONAL([ENABLE_UNITTESTS], [true]) + + saved_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${CMOCKA_CFLAGS}" + # detect cmocka < 2.0.0 that had no cmocka_version.h + AC_CHECK_HEADERS([cmocka_version.h]) + CFLAGS="${saved_CFLAGS}" +fi AC_SUBST([ENABLE_UNITTESTS]) TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS}"
tests/unit_tests/openvpn/test_common.h +21 -0
@@ -25,6 +25,27 @@#include <setjmp.h> #include <cmocka.h> +/* Do we use cmocka < 2.0.0? */ +#ifndef HAVE_CMOCKA_VERSION_H +#define HAVE_OLD_CMOCKA_API 1 +/* compat with various versions of cmocka.h +* Older versions have LargestIntegralType. Newer +* versions use uintmax_t. But LargestIntegralType +* is not guaranteed to be equal to uintmax_t, so +* we can't use that unconditionally. So we only use +* it if cmocka.h does not define LargestIntegralType. +*/ +#ifndef LargestIntegralType +#define LargestIntegralType uintmax_t +#endif +/* redefine 2.x API in terms of 1.x API */ +#define CMockaValueData LargestIntegralType +#define check_expected_uint check_expected +#define expect_uint_value expect_value +#define expect_check_data expect_check +#define cast_ptr_to_cmocka_value (x) (x) +#endif +/** * Sets up the environment for unit tests like making both stderr and stdout * non-buffered to avoid messages getting lost if the program exits early.
tests/unit_tests/openvpn/test_tls_crypt.c +3 -3
@@ -112,8 +112,8 @@ __wrap_buffer_write_file(const char *filename, const struct buffer *buf) { const char *pem = BSTR(buf); -check_expected (filename); -check_expected (pem); +check_expected_ptr (filename); +check_expected_ptr (pem);return mock_type (bool); }
@@ -121,7 +121,7 @@struct buffer __wrap_buffer_read_from_file (const char *filename,struct gc_arena *gc) { -check_expected (filename); +check_expected_ptr (filename); const char *pem_str = mock_ptr_type(const char *);struct buffer ret =alloc_buf_gc (strlen (pem_str) +1 , gc);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: newpatchset
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ifb6594700db71d219643a29c581099c778bcbbc6
Gerrit-Change-Number: 1462
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email )
Change subject: tests/unit_tests: Port to cmocka 2.0.0 API
......................................................................
tests/unit_tests: Port to cmocka 2.0.0 API
But add compat layer so that we can still build
against older versions of cmocka. Mostly this is
trivial but the custom check function changed its
prototype, so that requires some more work.
This backport commit additionally includes the fix for test_tls_crypt from commit 6246f2113f6e1fda13bca8de863dd5cc396ab6ef since the other test fixes from the original commit are not relevant to release/2.6.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/1462
(cherry picked from commit 6db186e0b1d9783ea96e8a945a47fd23b45e4778)
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg35273.html
---
M CMakeLists.txt
M config.h.cmake.in
M configure.ac
M tests/unit_tests/openvpn/test_common.h
M tests/unit_tests/openvpn/test_tls_crypt.c
5 files changed, 49 insertions(+), 12 deletions(-)
CMakeLists.txt +12 -8
@@ -291,6 +291,18 @@ ) set(HAVE_CONFIG_VERSION_H YES) +if (BUILD_TESTING) + find_package(cmocka CONFIG) + if (TARGET cmocka::cmocka) + set(CMOCKA_LIBRARIES cmocka::cmocka) + else () + pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) + set(CMOCKA_LIBRARIES PkgConfig::cmocka) + endif () + set(CMAKE_REQUIRED_LIBRARIES ${CMOCKA_LIBRARIES}) + check_include_files(cmocka_version.h HAVE_CMOCKA_VERSION_H) +endif () + configure_file(config.h.cmake.in config.h) configure_file(include/openvpn-plugin.h.in openvpn-plugin.h) # TODO we should remove the need for this, and always include config.h
@@ -541,14 +553,6 @@ if (BUILD_TESTING) - find_package(cmocka CONFIG) - if (TARGET cmocka::cmocka) - set(CMOCKA_LIBRARIES cmocka::cmocka) - else () - pkg_search_module(cmocka cmocka REQUIRED IMPORTED_TARGET) - set(CMOCKA_LIBRARIES PkgConfig::cmocka) - endif () - set(unit_tests "test_auth_token" "test_buffer"
config.h.cmake.in +3 -0
@@ -86,6 +86,9 @@ /* git version information in config-version.h */ #cmakedefine HAVE_CONFIG_VERSION_H +/* cmocka version information available in cmocka_version.h (>= 2.0.0) */ +#cmakedefine HAVE_CMOCKA_VERSION_H + /* Define to 1 if you have the `daemon' function. */ #cmakedefine HAVE_DAEMON
configure.ac +10 -1
@@ -1525,7 +1525,16 @@ [have_cmocka="yes"], [AC_MSG_WARN([cmocka.pc not found on the system using pkg-config ${pkg_config_found}. Unit tests disabled])] ) -AM_CONDITIONAL([ENABLE_UNITTESTS], [test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes" ]) +AM_CONDITIONAL([ENABLE_UNITTESTS], [false]) +if test "${enable_unit_tests}" = "yes" -a "${have_cmocka}" = "yes"; then + AM_CONDITIONAL([ENABLE_UNITTESTS], [true]) + + saved_CFLAGS="${CFLAGS}" + CFLAGS="${CFLAGS} ${CMOCKA_CFLAGS}" + # detect cmocka < 2.0.0 that had no cmocka_version.h + AC_CHECK_HEADERS([cmocka_version.h]) + CFLAGS="${saved_CFLAGS}" +fi AC_SUBST([ENABLE_UNITTESTS]) TEST_LDFLAGS="${OPTIONAL_CRYPTO_LIBS} ${OPTIONAL_PKCS11_HELPER_LIBS}"
tests/unit_tests/openvpn/test_common.h +21 -0
@@ -25,6 +25,27 @@#include <setjmp.h> #include <cmocka.h> +/* Do we use cmocka < 2.0.0? */ +#ifndef HAVE_CMOCKA_VERSION_H +#define HAVE_OLD_CMOCKA_API 1 +/* compat with various versions of cmocka.h +* Older versions have LargestIntegralType. Newer +* versions use uintmax_t. But LargestIntegralType +* is not guaranteed to be equal to uintmax_t, so +* we can't use that unconditionally. So we only use +* it if cmocka.h does not define LargestIntegralType. +*/ +#ifndef LargestIntegralType +#define LargestIntegralType uintmax_t +#endif +/* redefine 2.x API in terms of 1.x API */ +#define CMockaValueData LargestIntegralType +#define check_expected_uint check_expected +#define expect_uint_value expect_value +#define expect_check_data expect_check +#define cast_ptr_to_cmocka_value (x) (x) +#endif +/** * Sets up the environment for unit tests like making both stderr and stdout * non-buffered to avoid messages getting lost if the program exits early.
tests/unit_tests/openvpn/test_tls_crypt.c +3 -3
@@ -112,8 +112,8 @@ __wrap_buffer_write_file(const char *filename, const struct buffer *buf) { const char *pem = BSTR(buf); -check_expected (filename); -check_expected (pem); +check_expected_ptr (filename); +check_expected_ptr (pem);return mock_type (bool); }
@@ -121,7 +121,7 @@struct buffer __wrap_buffer_read_from_file (const char *filename,struct gc_arena *gc) { -check_expected (filename); +check_expected_ptr (filename); const char *pem_str = mock_ptr_type(const char *);struct buffer ret =alloc_buf_gc (strlen (pem_str) +1 , gc);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1462?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: openvpn
Gerrit-Branch: release/2.6
Gerrit-Change-Id: Ifb6594700db71d219643a29c581099c778bcbbc6
Gerrit-Change-Number: 1462
Gerrit-PatchSet: 2
Gerrit-Owner: flichtenheld <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: plaisthos <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>