wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 818843 - Part 3: Do not build test cases. r=ted

Browse Source
This commit is contained in:
Steven Lee 2013-03-19 16:02:44 -04:00
parent 3f6c488548
commit 292d5cf0b5
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
media/mtransport/test/Makefile.in
View File

@ -105,6 +105,7 @@ DEFINES += \
endif
ifneq ($(OS_TARGET),WINNT)
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
CPP_UNIT_TESTS = \
ice_unittest.cpp \
nrappkit_unittest.cpp \
@ -116,6 +117,7 @@ ifdef MOZ_SCTP
CPP_UNIT_TESTS += sctp_unittest.cpp
endif
endif
endif
include $(topsrcdir)/config/rules.mk

7
media/webrtc/moz.build
View File

@ -5,8 +5,11 @@
EXTERNAL_MAKE_DIRS += [
'trunk',
'trunk/testing',
'signaling',
'signalingtest',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk':
EXTERNAL_MAKE_DIRS += [
'trunk/testing',
'signalingtest',
]

2
media/webrtc/signaling/test/Makefile.in
View File

@ -142,6 +142,7 @@ LOCAL_INCLUDES += \
$(NULL)
ifneq ($(OS_TARGET),WINNT)
ifneq (gonk,$(MOZ_WIDGET_TOOLKIT))
ifdef JS_SHARED_LIBRARY
LIBS += $(MOZ_ZLIB_LIBS)
endif
@ -152,6 +153,7 @@ CPP_UNIT_TESTS = \
mediaconduit_unittests.cpp \
$(NULL)
endif
endif
include $(topsrcdir)/config/config.mk
include $(topsrcdir)/media/webrtc/webrtc-config.mk

10
toolkit/toolkit.mozbuild
View File

@ -242,8 +242,8 @@ if CONFIG['ENABLE_TESTS']:
'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',
])