Reland "[test] Fix cctest path separators on Windows"
Now run-tests.py understands "suite/foo/bar" with forward slashes for
command-line test selection on all test suites on all platforms.
Previously, file-based suites like mjsunit also accepted "mjsunit/foo\bar";
that behavior is sacrificed here in favor of unification. For the cctest
suite, OTOH, it wasn't possible on Windows to select specific tests at all.
Original review: https://codereview.chromium.org/1348653003/
This reverts commit 5f44a91059
.
NOTRY=true
Review URL: https://codereview.chromium.org/1356613002
Cr-Commit-Position: refs/heads/master@{#30798}
This commit is contained in:
parent
007eac94a1
commit
9516dccd41
@ -46,7 +46,9 @@ class IntlTestSuite(testsuite.TestSuite):
|
||||
for filename in files:
|
||||
if (filename.endswith(".js") and filename != "assert.js" and
|
||||
filename != "utils.js"):
|
||||
testname = os.path.join(dirname[len(self.root) + 1:], filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.root) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
test = testcase.TestCase(self, testname)
|
||||
tests.append(test)
|
||||
return tests
|
||||
|
@ -52,7 +52,9 @@ class MessageTestSuite(testsuite.TestSuite):
|
||||
files.sort()
|
||||
for filename in files:
|
||||
if filename.endswith(".js"):
|
||||
testname = os.path.join(dirname[len(self.root) + 1:], filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.root) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
test = testcase.TestCase(self, testname)
|
||||
tests.append(test)
|
||||
return tests
|
||||
|
@ -52,7 +52,9 @@ class MjsunitTestSuite(testsuite.TestSuite):
|
||||
files.sort()
|
||||
for filename in files:
|
||||
if filename.endswith(".js") and filename != "mjsunit.js":
|
||||
testname = os.path.join(dirname[len(self.root) + 1:], filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.root) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
test = testcase.TestCase(self, testname)
|
||||
tests.append(test)
|
||||
return tests
|
||||
|
@ -81,8 +81,9 @@ class MozillaTestSuite(testsuite.TestSuite):
|
||||
files.sort()
|
||||
for filename in files:
|
||||
if filename.endswith(".js") and not filename in FRAMEWORK:
|
||||
testname = os.path.join(dirname[len(self.testroot) + 1:],
|
||||
filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.testroot) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
case = testcase.TestCase(self, testname)
|
||||
tests.append(case)
|
||||
return tests
|
||||
@ -93,7 +94,7 @@ class MozillaTestSuite(testsuite.TestSuite):
|
||||
result += ["--expose-gc"]
|
||||
result += [os.path.join(self.root, "mozilla-shell-emulation.js")]
|
||||
testfilename = testcase.path + ".js"
|
||||
testfilepath = testfilename.split(os.path.sep)
|
||||
testfilepath = testfilename.split("/")
|
||||
for i in xrange(len(testfilepath)):
|
||||
script = os.path.join(self.testroot,
|
||||
reduce(os.path.join, testfilepath[:i], ""),
|
||||
|
@ -119,8 +119,9 @@ class Test262TestSuite(testsuite.TestSuite):
|
||||
files.sort()
|
||||
for filename in files:
|
||||
if filename.endswith(".js"):
|
||||
testname = os.path.join(dirname[len(self.testroot) + 1:],
|
||||
filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.testroot) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
case = testcase.TestCase(self, testname)
|
||||
tests.append(case)
|
||||
return tests
|
||||
|
@ -66,8 +66,9 @@ class Test262TestSuite(testsuite.TestSuite):
|
||||
files.sort()
|
||||
for filename in files:
|
||||
if filename.endswith(".js"):
|
||||
testname = os.path.join(dirname[len(self.testroot) + 1:],
|
||||
filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.testroot) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
case = testcase.TestCase(self, testname)
|
||||
tests.append(case)
|
||||
return tests
|
||||
|
@ -55,7 +55,9 @@ class WebkitTestSuite(testsuite.TestSuite):
|
||||
files.sort()
|
||||
for filename in files:
|
||||
if filename.endswith(".js"):
|
||||
testname = os.path.join(dirname[len(self.root) + 1:], filename[:-3])
|
||||
fullpath = os.path.join(dirname, filename)
|
||||
relpath = fullpath[len(self.root) + 1 : -3]
|
||||
testname = relpath.replace(os.path.sep, "/")
|
||||
test = testcase.TestCase(self, testname)
|
||||
tests.append(test)
|
||||
return tests
|
||||
|
@ -226,7 +226,7 @@ class TestSuite(object):
|
||||
continue
|
||||
if len(argpath) == 1 or (len(argpath) == 2 and argpath[1] == '*'):
|
||||
return # Don't filter, run all tests in this suite.
|
||||
path = os.path.sep.join(argpath[1:])
|
||||
path = '/'.join(argpath[1:])
|
||||
if path[-1] == '*':
|
||||
path = path[:-1]
|
||||
globs.append(path)
|
||||
|
Loading…
Reference in New Issue
Block a user