From 11fefe136cc8426c608b2832cb7f9a33faf7f7eb Mon Sep 17 00:00:00 2001
From: Mike Conley <mconley@mozilla.com>
Date: Mon, 29 Jul 2019 14:01:12 +0000
Subject: [PATCH] Bug 1569421 - Re-enable browser_startup_mainthreadio.js and
 browser_startup_syncIPC.js for macOS 10.14. r=florian

Differential Revision: https://phabricator.services.mozilla.com/D39607

--HG--
extra : moz-landing-system : lando
---
 .../test/performance/browser_startup_mainthreadio.js        | 1 +
 .../content/test/performance/browser_startup_syncIPC.js     | 6 ++++++
 browser/base/content/test/performance/io/browser.ini        | 2 --
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/browser/base/content/test/performance/browser_startup_mainthreadio.js b/browser/base/content/test/performance/browser_startup_mainthreadio.js
index 4a564daad538..832f249163d1 100644
--- a/browser/base/content/test/performance/browser_startup_mainthreadio.js
+++ b/browser/base/content/test/performance/browser_startup_mainthreadio.js
@@ -103,6 +103,7 @@ const startupPhases = {
     {
       // At least the read seems unavoidable for a regular startup.
       path: "UAppData:profiles.ini",
+      ignoreIfUnused: true,
       condition: MAC,
       stat: 1,
       read: 1,
diff --git a/browser/base/content/test/performance/browser_startup_syncIPC.js b/browser/base/content/test/performance/browser_startup_syncIPC.js
index f722d0f2b634..c34500788d89 100644
--- a/browser/base/content/test/performance/browser_startup_syncIPC.js
+++ b/browser/base/content/test/performance/browser_startup_syncIPC.js
@@ -212,6 +212,12 @@ const startupPhases = {
       ignoreIfUnused: true,
       maxCount: 1,
     },
+    {
+      name: "PCompositorBridge::Msg_FlushRendering",
+      condition: MAC,
+      ignoreIfUnused: true,
+      maxCount: 1,
+    },
   ],
 };
 
diff --git a/browser/base/content/test/performance/io/browser.ini b/browser/base/content/test/performance/io/browser.ini
index 5500a6754a23..847cf9f9238b 100644
--- a/browser/base/content/test/performance/io/browser.ini
+++ b/browser/base/content/test/performance/io/browser.ini
@@ -19,7 +19,5 @@ environment =
   MOZ_PROFILER_STARTUP_FEATURES=js,mainthreadio
   MOZ_PROFILER_STARTUP_ENTRIES=10000000
 [../browser_startup_mainthreadio.js]
-skip-if = (os == 'mac') # macosx1014 due to 1554789, 1557221
 [../browser_startup_content_mainthreadio.js]
 [../browser_startup_syncIPC.js]
-skip-if = (os == 'mac') # macosx1014 due to 1561940, 1562360