Bug 964563 - Remove custom node binary. r=ted

netwerk/test/unit/xpcshell.ini

@@ -276,9 +276,9 @@ fail-if = os == "android"
 fail-if = os == "android"
 # spdy and http2 unit tests require us to have node available to run the spdy and http2 server
 [test_spdy.js]
-run-if = hasNode && processor == "x86_64"
+run-if = hasNode
 [test_http2.js]
-run-if = hasNode && processor == "x86_64"
+run-if = hasNode
 [test_speculative_connect.js]
 [test_standardurl.js]
 [test_standardurl_port.js]

testing/xpcshell/Makefile.in

@@ -20,7 +20,6 @@ TEST_HARNESS_FILES := \
   moz-spdy \
   node-http2 \
   moz-http2 \
-  node \
   $(NULL)
 
 # Extra files needed from $(topsrcdir)/build

testing/xpcshell/runxpcshelltests.py

@@ -969,9 +969,7 @@ class XPCShellTests(object):
 
         # We try to find the node executable in the path given to us by the user in
         # the MOZ_NODE_PATH environment variable
-        # localPath = os.getenv('MOZ_NODE_PATH', None)
-        # Temporarily, we use the node binary in this directory
-        localPath = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'node')
+        localPath = os.getenv('MOZ_NODE_PATH', None)
         if localPath and os.path.exists(localPath) and os.path.isfile(localPath):
             nodeBin = localPath
 
@@ -993,7 +991,7 @@ class XPCShellTests(object):
                         # tell us it's started
                         msg = process.stdout.readline()
                         if 'server listening' in msg:
-                            nodeMozInfo['hasNode'] = True  # Todo: refactor this
+                            nodeMozInfo['hasNode'] = True
                     except OSError, e:
                         # This occurs if the subprocess couldn't be started
                         self.log.error('Could not run %s server: %s' % (name, str(e)))