Merge m-c to b2g-inbound.

This commit is contained in:
Ryan VanderMeulen 2014-09-15 12:40:28 -04:00
commit 26064f7597

View File

@ -7,7 +7,6 @@
if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
CppUnitTests([
'buffered_stun_socket_unittest',
'ice_unittest',
'nrappkit_unittest',
'rlogringbuffer_unittest',
'runnable_utils_unittest',
@ -18,6 +17,12 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
'turn_unittest',
])
# Bug 1037618 - Cross-tree (network related?) failures on OSX
if CONFIG['OS_TARGET'] != 'Darwin':
CppUnitTests([
'ice_unittest',
])
if CONFIG['MOZ_SCTP']:
CppUnitTests([
'sctp_unittest',