diff options
| author | Eduardo Lima (Etrunko) <etrunko@redhat.com> | 2016-03-30 15:39:06 -0300 |
|---|---|---|
| committer | Christophe Fergeau <cfergeau@redhat.com> | 2016-03-31 11:25:02 +0200 |
| commit | 51df6f775a83b7756f4723fcf1a99262b2e3d4a4 (patch) | |
| tree | fd400192b7899194acc71e162f74a520b5d29137 | |
| parent | 5b6be16b37370bb774aa3c2a7d5c41791fdc3a1e (diff) | |
Fix build in systems with Glib version older than 2.38
Tests now include functions only available in glib 2.38. To avoid
setting the dependency bar too high, we simply put them between #ifdef
guards.
Signed-off-by: Eduardo Lima (Etrunko) <etrunko@redhat.com>
| -rw-r--r-- | tests/test-logging.c | 4 | ||||
| -rw-r--r-- | tests/test-marshallers.c | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/tests/test-logging.c b/tests/test-logging.c index eed149e..c02905f 100644 --- a/tests/test-logging.c +++ b/tests/test-logging.c @@ -43,6 +43,7 @@ LOG_OTHER_HELPER(message, MESSAGE) LOG_OTHER_HELPER(warning, WARNING) LOG_OTHER_HELPER(critical, CRITICAL) +#ifdef GLIB_CHECK_VERSION(2,38,0) /* Checks that spice_warning() aborts after changing SPICE_ABORT_LEVEL */ static void test_spice_abort_level(void) { @@ -376,6 +377,7 @@ static void test_spice_g_messages_debug_all(void) g_test_trap_assert_stdout("*spice_debug\n*spice_info\n*g_debug\n*g_info\n*other_debug\n*other_info\n"); g_test_trap_assert_stderr("*g_message\n*other_message\n"); } +#endif /* GLIB_CHECK_VERSION(2,38,0) */ static void handle_sigabrt(int sig) { @@ -399,6 +401,7 @@ int main(int argc, char **argv) * test cases are going to test */ g_log_set_always_fatal(fatal_mask & G_LOG_LEVEL_MASK); +#ifdef GLIB_CHECK_VERSION(2,38,0) g_test_add_func("/spice-common/spice-abort-level", test_spice_abort_level); g_test_add_func("/spice-common/spice-abort-level-gwarning", test_spice_abort_level_g_warning); g_test_add_func("/spice-common/spice-debug-level", test_spice_debug_level); @@ -412,6 +415,7 @@ int main(int argc, char **argv) g_test_add_func("/spice-common/spice-fatal-return-if-fail", test_spice_fatal_return_if_fail); g_test_add_func("/spice-common/spice-non-fatal-greturn-if-fail", test_spice_non_fatal_g_return_if_fail); g_test_add_func("/spice-common/spice-fatal-warning", test_spice_fatal_warning); +#endif /* GLIB_CHECK_VERSION(2,38,0) */ return g_test_run(); } diff --git a/tests/test-marshallers.c b/tests/test-marshallers.c index d2c80e5..0026b61 100644 --- a/tests/test-marshallers.c +++ b/tests/test-marshallers.c @@ -4,6 +4,10 @@ #include "common/marshaller.h" #include "generated_test_marshallers.h" +#ifndef g_assert_true +#define g_assert_true g_assert +#endif + static uint8_t expected_data[] = { 0x02, 0x00, 0x00, 0x00, /* data_size */ 0x08, 0x00, 0x00, 0x00, /* data offset */ 0xef, 0xcd, 0xab, 0x90, 0x78, 0x56, 0x34, 0x12, /* data */ |