From 0d5ecfccd2c8a4c81e50dc85293fb2bb5e26751e Mon Sep 17 00:00:00 2001
From: Mihai Alexandru Michis <malexandru@mozilla.com>
Date: Thu, 3 Sep 2020 01:56:09 +0300
Subject: [PATCH] Backed out changeset 71edbf86ce85 (bug 1662855) for causing
 xpcshell failures.

CLOSED TREE
---
 netwerk/test/httpserver/httpd.manifest          | 1 +
 netwerk/test/httpserver/moz.build               | 1 +
 python/mozbuild/mozbuild/action/test_archive.py | 2 ++
 testing/xpcshell/remotexpcshelltests.py         | 6 ++++++
 testing/xpcshell/runxpcshelltests.py            | 6 ++++++
 5 files changed, 16 insertions(+)
 create mode 100644 netwerk/test/httpserver/httpd.manifest

diff --git a/netwerk/test/httpserver/httpd.manifest b/netwerk/test/httpserver/httpd.manifest
new file mode 100644
index 0000000000000..ff184e020b977
--- /dev/null
+++ b/netwerk/test/httpserver/httpd.manifest
@@ -0,0 +1 @@
+interfaces test_necko.xpt
diff --git a/netwerk/test/httpserver/moz.build b/netwerk/test/httpserver/moz.build
index d5679a04d8a0b..a3a3ee643c8b1 100644
--- a/netwerk/test/httpserver/moz.build
+++ b/netwerk/test/httpserver/moz.build
@@ -14,6 +14,7 @@ XPCSHELL_TESTS_MANIFESTS += ['test/xpcshell.ini']
 
 EXTRA_COMPONENTS += [
     'httpd.js',
+    'httpd.manifest',
 ]
 
 TESTING_JS_MODULES += [
diff --git a/python/mozbuild/mozbuild/action/test_archive.py b/python/mozbuild/mozbuild/action/test_archive.py
index cf21596034569..3b66835135c0e 100644
--- a/python/mozbuild/mozbuild/action/test_archive.py
+++ b/python/mozbuild/mozbuild/action/test_archive.py
@@ -271,6 +271,8 @@
             'base': 'dist/bin/components',
             'patterns': [
                 'httpd.js',
+                'httpd.manifest',
+                'test_necko.xpt',
             ],
             'dest': 'bin/components',
         },
diff --git a/testing/xpcshell/remotexpcshelltests.py b/testing/xpcshell/remotexpcshelltests.py
index ce5611efde44c..24207d6914fc1 100644
--- a/testing/xpcshell/remotexpcshelltests.py
+++ b/testing/xpcshell/remotexpcshelltests.py
@@ -140,6 +140,7 @@ def buildXpcsCmd(self):
         self.xpcshell = posixpath.join(self.remoteBinDir, "xpcw")
         self.headJSPath = posixpath.join(self.remoteScriptsDir, 'head.js')
         self.httpdJSPath = posixpath.join(self.remoteComponentsDir, 'httpd.js')
+        self.httpdManifest = posixpath.join(self.remoteComponentsDir, 'httpd.manifest')
         self.testingModulesDir = self.remoteModulesDir
         self.testharnessdir = self.remoteScriptsDir
         xpcsCmd = xpcshell.XPCShellTestThread.buildXpcsCmd(self)
@@ -447,6 +448,11 @@ def setupUtilities(self):
         self.device.push(local, remoteFile)
         self.device.chmod(remoteFile)
 
+        local = os.path.join(self.localBin, "components/httpd.manifest")
+        remoteFile = posixpath.join(self.remoteComponentsDir, "httpd.manifest")
+        self.device.push(local, remoteFile)
+        self.device.chmod(remoteFile)
+
         if self.options['localAPK']:
             remoteFile = posixpath.join(self.remoteBinDir,
                                         os.path.basename(self.options['localAPK']))
diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py
index bb4b70ba446fb..da0f8083f1291 100755
--- a/testing/xpcshell/runxpcshelltests.py
+++ b/testing/xpcshell/runxpcshelltests.py
@@ -170,6 +170,7 @@ def __init__(self, test_object, retry=True, verbose=False, usingTSan=False,
         self.debuggerInfo = kwargs.get('debuggerInfo')
         self.jsDebuggerInfo = kwargs.get('jsDebuggerInfo')
         self.pluginsPath = kwargs.get('pluginsPath')
+        self.httpdManifest = kwargs.get('httpdManifest')
         self.httpdJSPath = kwargs.get('httpdJSPath')
         self.headJSPath = kwargs.get('headJSPath')
         self.testharnessdir = kwargs.get('testharnessdir')
@@ -540,6 +541,7 @@ def buildXpcsCmd(self):
             self.xpcshell,
             '-g', self.xrePath,
             '-a', self.appPath,
+            '-r', self.httpdManifest,
             '-m',
             '-e', 'const _HEAD_JS_PATH = "%s";' % self.headJSPath,
             '-e', 'const _MOZINFO_JS_PATH = "%s";' % self.mozInfoJSPath,
@@ -1040,6 +1042,9 @@ def setAbsPath(self):
         self.httpdJSPath = os.path.join(self.xrePath, 'components', 'httpd.js')
         self.httpdJSPath = self.httpdJSPath.replace('\\', '/')
 
+        self.httpdManifest = os.path.join(self.xrePath, 'components', 'httpd.manifest')
+        self.httpdManifest = self.httpdManifest.replace('\\', '/')
+
         if self.mozInfo is None:
             self.mozInfo = os.path.join(self.testharnessdir, "mozinfo.json")
 
@@ -1586,6 +1591,7 @@ def runTests(self, options, testClass=XPCShellTestThread, mobileArgs=None):
             'debuggerInfo': self.debuggerInfo,
             'jsDebuggerInfo': self.jsDebuggerInfo,
             'pluginsPath': self.pluginsPath,
+            'httpdManifest': self.httpdManifest,
             'httpdJSPath': self.httpdJSPath,
             'headJSPath': self.headJSPath,
             'tempDir': self.tempDir,