[pulseaudio-commits] 2 commits - configure.ac src/tests

[Tanu Kaskinen]

 configure.ac               |    4 ++--
 src/tests/core-util-test.c |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f9985e1cbd801d7f2ae6c6a46147fa1a59340f59
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Aug 10 15:22:16 2016 +0200

    build: Check version of check library, require >= 0.9.10
    
    tests/core-util-test.c uses ck_assert_int_lt() which was introduced
    in check 0.9.10
    
    make this dependency (with --enable-tests) explicit in configure.ac
    
    Signed-off-by: Peter Meerwald-Stadler <pmeerw at pmeerw.net>

diff --git a/configure.ac b/configure.ac
index 7fbecab..1bcdda6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -668,11 +668,11 @@ AC_ARG_ENABLE([tests],
     AS_HELP_STRING([--disable-tests],[Disable unit tests]))
 
 AS_IF([test "x$enable_tests" != "xno"],
-    [PKG_CHECK_MODULES(LIBCHECK, [ check ], HAVE_LIBCHECK=1, HAVE_LIBCHECK=0)],
+    [PKG_CHECK_MODULES(LIBCHECK, [ check >= 0.9.10 ], HAVE_LIBCHECK=1, HAVE_LIBCHECK=0)],
     HAVE_LIBCHECK=0)
 
 AS_IF([test "x$enable_tests" = "xyes" && test "x$HAVE_LIBCHECK" = "x0"],
-    [AC_MSG_ERROR([*** check library not found])])
+    [AC_MSG_ERROR([*** check library not found or too old])])
 
 AM_CONDITIONAL([HAVE_TESTS], [test "x$HAVE_LIBCHECK" = x1])
 

commit 04feab17e3a08606cd375ccf40d40bca8704bbba
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed Aug 10 15:22:15 2016 +0200

    tests: Include signal.h in core-util-test.c
    
    on oldish Ubuntu 12.04:
    tests/core-util-test.c: In function ‘main’:
    tests/core-util-test.c:269:66: error: ‘SIGABRT’ undeclared (first use in this function)
         tcase_add_test_raise_signal(tc, modargs_test_replace_fail_1, SIGABRT);
    
    Signed-off-by: Peter Meerwald-Stadler <pmeerw at pmeerw.net>

diff --git a/src/tests/core-util-test.c b/src/tests/core-util-test.c
index c8e0fae..8d1db0c 100644
--- a/src/tests/core-util-test.c
+++ b/src/tests/core-util-test.c
@@ -19,6 +19,8 @@
 #include <config.h>
 #endif
 
+#include <signal.h>
+
 #include <check.h>
 
 #include <pulse/xmalloc.h>