Merge branch '351-disable-cmocka-by-default' into 'master'
Resolve "configure fails unless --enable-developer is specified" Closes #351 See merge request isc-projects/bind9!391
This commit is contained in:
4
configure
vendored
4
configure
vendored
@@ -22538,7 +22538,9 @@ fi
|
||||
|
||||
# Check whether --with-cmocka was given.
|
||||
if test "${with_cmocka+set}" = set; then :
|
||||
withval=$with_cmocka;
|
||||
withval=$with_cmocka; :
|
||||
else
|
||||
with_cmocka=no
|
||||
fi
|
||||
|
||||
|
||||
|
||||
@@ -4551,7 +4551,8 @@ AC_SUBST([LIBIDN2_LIBS])
|
||||
#
|
||||
|
||||
AC_ARG_WITH([cmocka],
|
||||
[AS_HELP_STRING([--with-cmocka=no],[enable cmocka based tests (default is no)])])
|
||||
[AS_HELP_STRING([--with-cmocka=no],[enable cmocka based tests (default is no)])],
|
||||
[:],[with_cmocka=no])
|
||||
|
||||
AS_CASE([$with_cmocka],
|
||||
[no],[:],
|
||||
|
||||
@@ -205,7 +205,7 @@
|
||||
|
||||
#ifdef UNIT_TESTING
|
||||
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);
|
||||
#define REQUIRE(expression) \
|
||||
mock_assert((int)(expression), #expression, __FILE__, __LINE__)
|
||||
#define ENSURE(expression) \
|
||||
|
||||
Reference in New Issue
Block a user