bug 482084 - rewrite xpcshell test harness, bustage fix followup, sort the results of glob
This commit is contained in:
@@ -85,17 +85,17 @@ def runTests(xpcshell, topsrcdir, testdirs, xrePath=None, testFile=None, interac
|
|||||||
|
|
||||||
# get the list of head and tail files from the directory
|
# get the list of head and tail files from the directory
|
||||||
testheadfiles = []
|
testheadfiles = []
|
||||||
for f in glob(os.path.join(testdir, "head_*.js")):
|
for f in sorted(glob(os.path.join(testdir, "head_*.js"))):
|
||||||
if os.path.isfile(f):
|
if os.path.isfile(f):
|
||||||
testheadfiles += ['-f', f]
|
testheadfiles += ['-f', f]
|
||||||
testtailfiles = []
|
testtailfiles = []
|
||||||
for f in glob(os.path.join(testdir, "tail_*.js")):
|
for f in sorted(glob(os.path.join(testdir, "tail_*.js"))):
|
||||||
if os.path.isfile(f):
|
if os.path.isfile(f):
|
||||||
testtailfiles += ['-f', f]
|
testtailfiles += ['-f', f]
|
||||||
|
|
||||||
# now execute each test individually
|
# now execute each test individually
|
||||||
# if a single test file was specified, we only want to execute that test
|
# if a single test file was specified, we only want to execute that test
|
||||||
testfiles = glob(os.path.join(testdir, "test_*.js"))
|
testfiles = sorted(glob(os.path.join(testdir, "test_*.js")))
|
||||||
if testFile:
|
if testFile:
|
||||||
if testFile in [os.path.basename(x) for x in testfiles]:
|
if testFile in [os.path.basename(x) for x in testfiles]:
|
||||||
testfiles = [os.path.join(testdir, testFile)]
|
testfiles = [os.path.join(testdir, testFile)]
|
||||||
|
|||||||
Reference in New Issue
Block a user