Bug 964563 - Remove custom node binary. r=ted

This commit is contained in:
Nicholas Hurley
2014-02-06 15:00:19 -08:00
parent 641c7b593c
commit b47878e83f
4 changed files with 4 additions and 7 deletions

View File

@@ -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)))