[gnet] tests: require check >= 0.9.7 for unit tests, and fix for new API



commit a61601a487394cbd5970c3b736aea71bf277ecc1
Author: Tim-Philipp Müller <tim muller collabora co uk>
Date:   Sat Oct 16 20:13:52 2010 +0100

    tests: require check >= 0.9.7 for unit tests, and fix for new API
    
    The check API changed slightly. Fix things for the new API.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=632258

 configure.ac            |    2 +-
 tests/check/gnetcheck.h |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b1937fe..7300d2f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -586,7 +586,7 @@ GTK_DOC_CHECK(1.2)
 
 dnl pkg-config check that for libcheck that works for cross-compiling
 dnl but not normal compilation on Fedora & Ubuntu:
- PKG_CHECK_MODULES(CHECK, check >= 0.9.4,
+ PKG_CHECK_MODULES(CHECK, check >= 0.9.7,
    AM_CONDITIONAL(HAVE_CHECK, true),
    AM_CONDITIONAL(HAVE_CHECK, false)
  )
diff --git a/tests/check/gnetcheck.h b/tests/check/gnetcheck.h
index aeb9f68..14b6c28 100644
--- a/tests/check/gnetcheck.h
+++ b/tests/check/gnetcheck.h
@@ -311,11 +311,11 @@ int main (int argc, char **argv)				\
 gboolean _gnet_check_run_test_func (const gchar * func_name);
 
 static inline void
-__gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name,
-    int sig, int start, int end)
+__gnet_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal,
+    int allowed_exit_value, int start, int end)
 {
-  if (_gnet_check_run_test_func (func_name)) {
-    _tcase_add_test (tc, tf, func_name, sig, start, end);
+  if (_gnet_check_run_test_func (fname)) {
+    _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end);
   }
 }
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]