зеркало из https://github.com/mozilla/gecko-dev.git
Bug 552847. xpcshell: fix "make check-one" and "check-interactive". a=jdm r=ted
This commit is contained in:
Родитель
033b450ca8
Коммит
155c68a4c6
|
@ -211,8 +211,8 @@ class XPCShellTests(object):
|
||||||
"""
|
"""
|
||||||
testfiles = sorted(glob(os.path.join(testdir, "test_*.js")))
|
testfiles = sorted(glob(os.path.join(testdir, "test_*.js")))
|
||||||
if self.singleFile:
|
if self.singleFile:
|
||||||
if singleFile in [os.path.basename(x) for x in testfiles]:
|
if self.singleFile in [os.path.basename(x) for x in testfiles]:
|
||||||
testfiles = [os.path.join(testdir, singleFile)]
|
testfiles = [os.path.join(testdir, self.singleFile)]
|
||||||
else: # not in this dir? skip it
|
else: # not in this dir? skip it
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
@ -366,7 +366,7 @@ class XPCShellTests(object):
|
||||||
for testdir in testdirs:
|
for testdir in testdirs:
|
||||||
self.buildXpcsCmd(testdir)
|
self.buildXpcsCmd(testdir)
|
||||||
|
|
||||||
if testPath and not testdir.endswith(testPath):
|
if self.testPath and not testdir.endswith(self.testPath):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
testdir = os.path.abspath(testdir)
|
testdir = os.path.abspath(testdir)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче