upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch '351-disable-cmocka-by-default' into 'master'

Browse source 
Resolve "configure fails unless --enable-developer is specified"

Closes #351

See merge request isc-projects/bind9!391
This commit is contained in:
Ondřej Surý 2018-06-21 06:29:10 -04:00
commit e1400e3667
3 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure vendored
View file

@ -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

3
configure.in
View file

@ -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],[:],

2
lib/isc/include/isc/util.h
View file

@ -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) \