Bug 1027440 - Build test plugins when building with --enable-default-toolkit=cairo-gtk3. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 20 Jun 2014 17:32:16 +0900
changeset 210545 2e2d182304f63f2878acab727909ce676bd6a988
parent 210544 c55157c6286c088c52847cd4f0da48ed120659dc
child 210546 d85096f5d781172cb059ee707838778a2e08bab1
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1027440
milestone33.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 1027440 - Build test plugins when building with --enable-default-toolkit=cairo-gtk3. r=mshal
dom/moz.build
dom/plugins/test/testplugin/testplugin.mk
dom/plugins/test/testplugin/testplugin.mozbuild
--- a/dom/moz.build
+++ b/dom/moz.build
@@ -123,11 +123,11 @@ if CONFIG['MOZ_B2G_BT_API_V2']:
 else:
     PARALLEL_DIRS += ['bluetooth']
 
 TEST_DIRS += [
     'tests',
     'imptests',
 ]
 
-if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'cocoa', 'windows', 'android', 'qt'):
+if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('gtk2', 'gtk3', 'cocoa', 'windows', 'android', 'qt'):
     TEST_DIRS += ['plugins/test']
 
--- a/dom/plugins/test/testplugin/testplugin.mk
+++ b/dom/plugins/test/testplugin/testplugin.mk
@@ -32,13 +32,13 @@ INSTALL_TARGETS += \
 	$(NULL)
 else
 TEST_PLUGIN_DEST = $(DIST)/plugins
 INSTALL_TARGETS += TEST_PLUGIN
 endif
 
 include $(topsrcdir)/config/rules.mk
 
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+ifneq (,$(filter gtk2 gtk3,$(MOZ_WIDGET_TOOLKIT)))
 CXXFLAGS        += $(MOZ_GTK2_CFLAGS)
 CFLAGS          += $(MOZ_GTK2_CFLAGS)
 EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) $(XLDFLAGS) $(XLIBS) $(XEXT_LIBS)
 endif
--- a/dom/plugins/test/testplugin/testplugin.mozbuild
+++ b/dom/plugins/test/testplugin/testplugin.mozbuild
@@ -15,17 +15,17 @@ UNIFIED_SOURCES += [
     'nptest_name.cpp',
 ]
 
 toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
 if toolkit == 'cocoa':
     UNIFIED_SOURCES += [
         relative_path + '/nptest_macosx.mm'
     ]
-elif toolkit == 'gtk2':
+elif toolkit in ('gtk2', 'gtk3'):
     UNIFIED_SOURCES += [
         relative_path + '/nptest_gtk2.cpp',
     ]
 elif toolkit == 'android':
     UNIFIED_SOURCES += [
         relative_path + '/nptest_droid.cpp',
     ]
 elif toolkit == 'qt':