Bug 1351658 - Package PropertyListUtils.jsm only on Mac r=florian
authorDan Banner <dbugs@thebanners.uk>
Thu, 04 May 2017 16:49:42 +0100
changeset 356843 53e95295210a
parent 356842 2e4c64214e31
child 356844 b363981633ad
push id31775
push userihsiao@mozilla.com
push dateMon, 08 May 2017 03:10:38 +0000
treeherdermozilla-central@22aaf8bad4df [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersflorian
bugs1351658
milestone55.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 1351658 - Package PropertyListUtils.jsm only on Mac r=florian MozReview-Commit-ID: wnhR1G5v0y
browser/base/content/test/static/browser_all_files_referenced.js
toolkit/modules/moz.build
toolkit/modules/tests/xpcshell/xpcshell.ini
--- a/browser/base/content/test/static/browser_all_files_referenced.js
+++ b/browser/base/content/test/static/browser_all_files_referenced.js
@@ -230,18 +230,16 @@ var whitelist = new Set([
   // Bug 1351070
   {file: "resource://gre/modules/ContentPrefInstance.jsm"},
   // Bug 1351079
   {file: "resource://gre/modules/ISO8601DateUtils.jsm"},
   // Bug 1337345
   {file: "resource://gre/modules/Manifest.jsm"},
   // Bug 1351089
   {file: "resource://gre/modules/PresentationDeviceInfoManager.jsm"},
-  // Bug 1351658
-  {file: "resource://gre/modules/PropertyListUtils.jsm", platforms: ["linux", "win"]},
   // Bug 1351097
   {file: "resource://gre/modules/accessibility/AccessFu.jsm"},
   // Bug 1351637
   {file: "resource://gre/modules/sdk/bootstrap.js"},
 
 ].filter(item =>
   ("isFromDevTools" in item) == isDevtools &&
   (!item.skipNightly || !AppConstants.NIGHTLY_BUILD) &&
--- a/toolkit/modules/moz.build
+++ b/toolkit/modules/moz.build
@@ -217,17 +217,16 @@ EXTRA_JS_MODULES += [
     'PopupNotifications.jsm',
     'Preferences.jsm',
     'PrivateBrowsingUtils.jsm',
     'ProfileAge.jsm',
     'Promise-backend.js',
     'Promise.jsm',
     'PromiseMessage.jsm',
     'PromiseUtils.jsm',
-    'PropertyListUtils.jsm',
     'RemoteController.jsm',
     'RemoteFinder.jsm',
     'RemotePageManager.jsm',
     'RemoteSecurityUI.jsm',
     'RemoteWebProgress.jsm',
     'ResetProfile.jsm',
     'ResponsivenessMonitor.jsm',
     'secondscreen/RokuApp.jsm',
@@ -244,16 +243,22 @@ EXTRA_JS_MODULES += [
     'Task.jsm',
     'Timer.jsm',
     'Troubleshoot.jsm',
     'UpdateUtils.jsm',
     'WebChannel.jsm',
     'WindowDraggingUtils.jsm',
     'ZipUtils.jsm',
 ]
+
+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
+    EXTRA_JS_MODULES += [
+        'PropertyListUtils.jsm',
+    ]
+
 EXTRA_JS_MODULES.third_party.jsesc += ['third_party/jsesc/jsesc.js']
 EXTRA_JS_MODULES.sessionstore += [
     'sessionstore/PrivacyLevel.jsm',
     'sessionstore/SessionHistory.jsm',
     'sessionstore/Utils.jsm',
 ]
 
 DEFINES['INSTALL_COMPACT_THEMES'] = 1
--- a/toolkit/modules/tests/xpcshell/xpcshell.ini
+++ b/toolkit/modules/tests/xpcshell/xpcshell.ini
@@ -44,17 +44,17 @@ skip-if = toolkit == 'android'
 skip-if = toolkit == 'android'
 [test_Preferences.js]
 skip-if = toolkit == 'android'
 [test_Promise.js]
 skip-if = toolkit == 'android'
 [test_PromiseUtils.js]
 skip-if = toolkit == 'android'
 [test_propertyListsUtils.js]
-skip-if = toolkit == 'android'
+skip-if = os != 'mac'
 [test_readCertPrefs.js]
 skip-if = toolkit == 'android'
 [test_Services.js]
 skip-if = toolkit == 'android'
 [test_sqlite.js]
 skip-if = toolkit == 'android'
 [test_sqlite_shutdown.js]
 skip-if = toolkit == 'android'