From c17697c8c0b4178e377ba32ea70122f65342b17d Mon Sep 17 00:00:00 2001 From: Ted Mielczarek Date: Wed, 11 Mar 2009 16:29:45 -0400 Subject: [PATCH] bug 482084 - rewrite xpcshell test harness, bustage fix followup, sort the results of glob --- testing/xpcshell/runxpcshelltests.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/xpcshell/runxpcshelltests.py b/testing/xpcshell/runxpcshelltests.py index b34477136fac..3dfe579f82f7 100644 --- a/testing/xpcshell/runxpcshelltests.py +++ b/testing/xpcshell/runxpcshelltests.py @@ -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 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): testheadfiles += ['-f', f] 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): testtailfiles += ['-f', f] # now execute each test individually # 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 in [os.path.basename(x) for x in testfiles]: testfiles = [os.path.join(testdir, testFile)]