Bug 1339432 - Ship GfxSanityTest only on Windows, r=Mossop.
authorFlorian Quèze <florian@queze.net>
Thu, 16 Feb 2017 00:13:09 +0100
changeset 343221 8479323bb43cc15ecfa4983acdce56875b6d25a8
parent 343220 09ca7a2cc13a3f6181095d23d27daabe3422d857
child 343222 d686f96840e6393400b06a54635a99f3477d2da8
push id31372
push usercbook@mozilla.com
push dateThu, 16 Feb 2017 12:16:10 +0000
treeherdermozilla-central@2737f66ad6ac [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMossop
bugs1339432
milestone54.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 1339432 - Ship GfxSanityTest only on Windows, r=Mossop.
toolkit/components/gfx/moz.build
toolkit/components/moz.build
--- a/toolkit/components/gfx/moz.build
+++ b/toolkit/components/gfx/moz.build
@@ -1,15 +1,12 @@
 # -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*-
 # 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/.
 
-toolkit = CONFIG['MOZ_WIDGET_TOOLKIT']
-
-if toolkit == 'windows':
-    EXTRA_COMPONENTS += [
-        'GfxSanityTest.manifest',
-        'SanityTest.js',
-    ]
+EXTRA_COMPONENTS += [
+    'GfxSanityTest.manifest',
+    'SanityTest.js',
+]
 
 JAR_MANIFESTS += ['jar.mn']
--- a/toolkit/components/moz.build
+++ b/toolkit/components/moz.build
@@ -25,17 +25,16 @@ DIRS += [
     'diskspacewatcher',
     'downloads',
     'extensions',
     'exthelper',
     'filewatcher',
     'finalizationwitness',
     'formautofill',
     'find',
-    'gfx',
     'jsdownloads',
     'lz4',
     'mediasniffer',
     'microformats',
     'mozprotocol',
     'osfile',
     'parentalcontrols',
     'passwordmgr',
@@ -97,13 +96,16 @@ if CONFIG['MOZ_TOOLKIT_SEARCH']:
 
 DIRS += ['captivedetect']
 
 if CONFIG['OS_TARGET'] != 'Android':
     DIRS += ['terminator']
 
 DIRS += ['build']
 
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    DIRS += ['gfx']
+
 if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android':
     EXTRA_COMPONENTS += [
         'nsDefaultCLH.js',
         'nsDefaultCLH.manifest',
     ]