Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 990266 - use mozinfo in xpcshell selftests r=jmaher

Browse Source
This commit is contained in:
Ted Mielczarek 2014-04-01 16:02:58 -04:00
parent c87e310e5f
commit 5ba7b3d366
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
testing/xpcshell/selftest.py
View File

@ -6,6 +6,8 @@
from __future__ import with_statement from __future__ import with_statement
import sys, os, unittest, tempfile, shutil import sys, os, unittest, tempfile, shutil
import mozinfo
from StringIO import StringIO from StringIO import StringIO
from xml.etree.ElementTree import ElementTree from xml.etree.ElementTree import ElementTree
@ -14,6 +16,8 @@ build_obj = MozbuildObject.from_environment()
from runxpcshelltests import XPCShellTests from runxpcshelltests import XPCShellTests
mozinfo.find_and_update_from_json()
objdir = build_obj.topobjdir.encode("utf-8") objdir = build_obj.topobjdir.encode("utf-8")
xpcshellBin = os.path.join(objdir, "dist", "bin", "xpcshell") xpcshellBin = os.path.join(objdir, "dist", "bin", "xpcshell")
if sys.platform == "win32": if sys.platform == "win32":
@ -272,7 +276,7 @@ tail =
self.assertEquals(expected, self.assertEquals(expected,
self.x.runTests(xpcshellBin, self.x.runTests(xpcshellBin,
manifest=self.manifest, manifest=self.manifest,
mozInfo={}, mozInfo=mozinfo.info,
shuffle=shuffle, shuffle=shuffle,
testsRootDir=self.tempdir, testsRootDir=self.tempdir,
verbose=verbose, verbose=verbose,