ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Merge branch '889-improve-clang-cmocka-interaction' into 'master'

Browse Source 
Resolve "Improve clang/cmocka interaction."

Closes #889

See merge request isc-projects/bind9!1542
This commit is contained in:
Evan Hunt
2019-03-05 13:34:30 -05:00
parent 12a8574aea cb913177ae
commit ea95d85091
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/dns/tests/result_test.c
View File

@@ -15,6 +15,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h>
#include <setjmp.h> #include <setjmp.h>
#include <string.h> #include <string.h>

21
lib/isc/include/isc/util.h
View File

@@ -197,15 +197,26 @@
#ifdef UNIT_TESTING #ifdef UNIT_TESTING
extern void mock_assert(const int result, const char* const expression, extern void mock_assert(const int result, const char* const expression,
const char * const file, const int line); const char * const file, const int line);
/*
* Allow clang to determine that the following code is not reached
* by calling abort() if the condition fails. The abort() will
* never be executed as mock_assert() and _assert_true() longjmp
* or exit if the condition is false.
*/
#define REQUIRE(expression) \ #define REQUIRE(expression) \
mock_assert((int)(expression), #expression, __FILE__, __LINE__) ((!(expression)) ? \
(mock_assert(0, #expression, __FILE__, __LINE__), abort()) : (void)0)
#define ENSURE(expression) \ #define ENSURE(expression) \
mock_assert((int)(expression), #expression, __FILE__, __LINE__) ((!(int)(expression)) ? \
(mock_assert(0, #expression, __FILE__, __LINE__), abort()) : (void)0)
#define INSIST(expression) \ #define INSIST(expression) \
mock_assert((int)(expression), #expression, __FILE__, __LINE__) ((!(expression)) ? \
(mock_assert(0, #expression, __FILE__, __LINE__), abort()) : (void)0)
#define INVARIANT(expression) \ #define INVARIANT(expression) \
mock_assert((int)(expression), #expression, __FILE__, __LINE__) ((!(expression)) ? \
(mock_assert(0, #expression, __FILE__, __LINE__), abort()) : (void)0)
#define _assert_true(c, e, f, l) \
((c) ? (void)0 : (_assert_true(0, e, f, l), abort()))
#else /* UNIT_TESTING */ #else /* UNIT_TESTING */
/* /*
* Assertions * Assertions

1
lib/isc/tests/netaddr_test.c
View File

@@ -15,6 +15,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h>
#include <setjmp.h> #include <setjmp.h>
#include <stdbool.h> #include <stdbool.h>

1
lib/isc/tests/result_test.c
View File

@@ -15,6 +15,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h>
#include <setjmp.h> #include <setjmp.h>
#include <string.h> #include <string.h>

1
lib/isccc/tests/result_test.c
View File

@@ -15,6 +15,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
#include <stdlib.h>
#include <setjmp.h> #include <setjmp.h>
#include <string.h> #include <string.h>