diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-19 21:27:48 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2009-03-19 21:31:08 +0000 |
| commit | d430552ec3767a928b6b9e07a49dbaf8ad966808 (patch) | |
| tree | 791e00cdb13082f3f5dc1bb36243436ec0029b33 | |
| parent | b4b386a1fdd5505c6aa07656f253532829c4bfa6 (diff) | |
gstcheck: fix for check versions > 0.9.6
A new argument allowed_exit_value was added in SVN recently (#574213).
| -rw-r--r-- | libs/gst/check/gstcheck.h | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/libs/gst/check/gstcheck.h b/libs/gst/check/gstcheck.h index cf10993900..8fa6eb8046 100644 --- a/libs/gst/check/gstcheck.h +++ b/libs/gst/check/gstcheck.h @@ -38,6 +38,12 @@ G_BEGIN_DECLS GST_DEBUG_CATEGORY_EXTERN (check_debug); #define GST_CAT_DEFAULT check_debug +#define __CHECK_VERSION_LATER_THAN(major,minor,micro) \ + (CHECK_MAJOR_VERSION > major || \ + (CHECK_MAJOR_VERSION == (major) && CHECK_MINOR_VERSION > (minor)) || \ + (CHECK_MAJOR_VERSION == (major) && CHECK_MINOR_VERSION == (minor) && \ + CHECK_MICRO_VERSION > (micro))) + /* logging function for tests * a test uses g_message() to log a debug line * a gst unit test can be run with GST_TEST_DEBUG env var set to see the @@ -108,9 +114,7 @@ gst_check_message_error (msg, GST_MESSAGE_ERROR, \ * * wrapper for checks END_TEST */ -#if CHECK_MAJOR_VERSION > 0 || \ - (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION > 9) || \ - (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 3) +#if __CHECK_VERSION_LATER_THAN(0,9,3) #define GST_START_TEST(__testname) \ static void __testname (int __i__)\ {\ @@ -421,9 +425,16 @@ int main (int argc, char **argv) \ gboolean _gst_check_run_test_func (const gchar * func_name); -#if CHECK_MAJOR_VERSION > 0 || \ - (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION > 9) || \ - (CHECK_MAJOR_VERSION == 0 && CHECK_MINOR_VERSION == 9 && CHECK_MICRO_VERSION > 3) +#if __CHECK_VERSION_LATER_THAN(0,9,6) +static inline void +__gst_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal, + int allowed_exit_value, int start, int end) +{ + if (_gst_check_run_test_func (fname)) { + _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end); + } +} +#elif __CHECK_VERSION_LATER_THAN(0,9,3) static inline void __gst_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal, int start, int end) @@ -444,6 +455,8 @@ __gst_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal) #define _tcase_add_test __gst_tcase_add_test +#undef __CHECK_VERSION_LATER_THAN + G_END_DECLS #endif /* __GST_CHECK_H__ */ |