[farsight2/master] Disable multicast tests if we don't have a multicast capable interface up

Olivier Crête olivier.crete at collabora.co.uk
Tue Dec 23 15:25:35 PST 2008


---
 tests/check/transmitter/multicast.c |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/tests/check/transmitter/multicast.c b/tests/check/transmitter/multicast.c
index c6b57ce..820b108 100644
--- a/tests/check/transmitter/multicast.c
+++ b/tests/check/transmitter/multicast.c
@@ -257,8 +257,8 @@ _find_multicast_capable_address (void)
   freeifaddrs (results);
 
   if (retval == NULL)
-    g_message ("Skipping test of prefered-local-candidates, no multicast"
-        " capable interface found");
+    g_message ("Skipping multicast transmitter tests, "
+        "no multicast capable interface found");
   return retval;
 
 #else
@@ -309,6 +309,15 @@ multicasttransmitter_suite (void)
   Suite *s = suite_create ("multicasttransmitter");
   TCase *tc_chain;
   GLogLevelFlags fatal_mask;
+  gchar *tmp_addr;
+
+
+  tmp_addr = _find_multicast_capable_address ();
+
+  if (!tmp_addr)
+    return s;
+  else
+    g_free (tmp_addr);
 
   fatal_mask = g_log_set_always_fatal (G_LOG_FATAL_MASK);
   fatal_mask |= G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL;
-- 
1.5.6.5




More information about the farsight-commits mailing list