Bug 818843 - Part 3: Do not build test cases. r=ted
authorSteven Lee <slee@mozilla.com>
Tue, 19 Mar 2013 16:02:44 -0400
changeset 125492 3491ce05b207eb43cedb03490597abe65e5c4fa6
parent 125491 b7bd912ce45a49a14dbd2ebec3208a8d866f206a
child 125493 e6b9b196436fb2d81b8f38c9b203346f863a6d9b
push id24459
push useremorley@mozilla.com
push dateWed, 20 Mar 2013 11:46:36 +0000
treeherdermozilla-central@1d6fe70c79c5 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs818843
milestone22.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 818843 - Part 3: Do not build test cases. r=ted
media/mtransport/test/Makefile.in
media/webrtc/moz.build
media/webrtc/signaling/test/Makefile.in
toolkit/toolkit.mozbuild
--- a/media/mtransport/test/Makefile.in
+++ b/media/mtransport/test/Makefile.in
@@ -100,22 +100,24 @@ CPPFLAGS += \
   $(STLPORT_CPPFLAGS) \
   $(NULL)
 DEFINES += \
   -DGTEST_USE_OWN_TR1_TUPLE=1 \
   $(NULL)
 endif
 
 ifneq ($(OS_TARGET),WINNT)
+ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 CPP_UNIT_TESTS = \
   ice_unittest.cpp \
   nrappkit_unittest.cpp \
   sockettransportservice_unittest.cpp \
   transport_unittests.cpp \
   runnable_utils_unittest.cpp \
   $(NULL)
 ifdef MOZ_SCTP
 CPP_UNIT_TESTS += sctp_unittest.cpp
 endif
 
 endif
+endif
 
 include $(topsrcdir)/config/rules.mk
--- a/media/webrtc/moz.build
+++ b/media/webrtc/moz.build
@@ -1,12 +1,15 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 EXTERNAL_MAKE_DIRS += [
     'trunk',
-    'trunk/testing',
     'signaling',
-    'signalingtest',
 ]
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+    EXTERNAL_MAKE_DIRS += [
+        'trunk/testing',
+        'signalingtest',
+    ]
--- a/media/webrtc/signaling/test/Makefile.in
+++ b/media/webrtc/signaling/test/Makefile.in
@@ -137,23 +137,25 @@ LOCAL_INCLUDES += \
  -I$(topsrcdir)/media/webrtc/signaling/src/sipcc/include \
  -I$(topsrcdir)/media/webrtc/signaling/src/peerconnection \
  -I$(topsrcdir)/media/webrtc/signaling/media-conduit\
  -I$(topsrcdir)/media/webrtc/trunk/third_party/libjingle/source/ \
  -I$(topsrcdir)/xpcom/base/ \
  $(NULL)
 
 ifneq ($(OS_TARGET),WINNT)
+ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
 ifdef JS_SHARED_LIBRARY
 LIBS += $(MOZ_ZLIB_LIBS)
 endif
 
 CPP_UNIT_TESTS = \
   signaling_unittests.cpp \
   mediapipeline_unittest.cpp \
   mediaconduit_unittests.cpp \
   $(NULL)
 endif
+endif
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/media/webrtc/webrtc-config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
 include $(topsrcdir)/config/rules.mk
--- a/toolkit/toolkit.mozbuild
+++ b/toolkit/toolkit.mozbuild
@@ -237,13 +237,13 @@ if CONFIG['ENABLE_TESTS']:
         'testing/mochitest',
         'testing/xpcshell',
         'testing/tools/screenshot',
         'testing/peptest',
         'testing/mozbase',
         'testing/modules',
     ])
 
-    if CONFIG['MOZ_WEBRTC']:
-        add_tier_dir('platform', [
-            'media/webrtc/signaling/test',
-            'media/mtransport/test',
-        ])
+    if CONFIG['MOZ_WEBRTC'] and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
+            add_tier_dir('platform', [
+                'media/webrtc/signaling/test',
+                'media/mtransport/test',
+            ])