| Index: test/mozilla/testcfg.py
|
| diff --git a/test/mozilla/testcfg.py b/test/mozilla/testcfg.py
|
| index 5aeac4cc67699c8dc73bc0e816fc2e3641d9b6d5..775a239f07d186655d8efcb09f1ecd118324f01b 100644
|
| --- a/test/mozilla/testcfg.py
|
| +++ b/test/mozilla/testcfg.py
|
| @@ -104,7 +104,7 @@ class MozillaTestSuite(testsuite.TestSuite):
|
| return testcase.flags + result
|
|
|
| def GetSourceForTest(self, testcase):
|
| - filename = join(self.testroot, testcase.path + ".js")
|
| + filename = os.path.join(self.testroot, testcase.path + ".js")
|
| with open(filename) as f:
|
| return f.read()
|
|
|
| @@ -150,7 +150,7 @@ class MozillaTestSuite(testsuite.TestSuite):
|
| if code != 0:
|
| os.chdir(old_cwd)
|
| raise Exception("Error checking out Mozilla test suite!")
|
| - os.rename(join("mozilla", "js", "tests"), directory_name)
|
| + os.rename(os.path.join("mozilla", "js", "tests"), directory_name)
|
| shutil.rmtree("mozilla")
|
| with tarfile.open(archive_file, "w:gz") as tar:
|
| tar.add("data")
|
| @@ -161,96 +161,3 @@ class MozillaTestSuite(testsuite.TestSuite):
|
|
|
| def GetSuite(name, root):
|
| return MozillaTestSuite(name, root)
|
| -
|
| -
|
| -# Deprecated definitions below.
|
| -# TODO(jkummerow): Remove when SCons is no longer supported.
|
| -
|
| -
|
| -from os.path import exists
|
| -from os.path import join
|
| -import test
|
| -
|
| -
|
| -class MozillaTestCase(test.TestCase):
|
| -
|
| - def __init__(self, filename, path, context, root, mode, framework):
|
| - super(MozillaTestCase, self).__init__(context, path, mode)
|
| - self.filename = filename
|
| - self.framework = framework
|
| - self.root = root
|
| -
|
| - def IsNegative(self):
|
| - return self.filename.endswith('-n.js')
|
| -
|
| - def GetLabel(self):
|
| - return "%s mozilla %s" % (self.mode, self.GetName())
|
| -
|
| - def IsFailureOutput(self, output):
|
| - if output.exit_code != 0:
|
| - return True
|
| - return 'FAILED!' in output.stdout
|
| -
|
| - def GetCommand(self):
|
| - result = self.context.GetVmCommand(self, self.mode) + \
|
| - [ '--expose-gc', join(self.root, 'mozilla-shell-emulation.js') ]
|
| - result += [ '--es5_readonly' ] # Temporary hack until we can remove flag
|
| - result += self.framework
|
| - result.append(self.filename)
|
| - return result
|
| -
|
| - def GetName(self):
|
| - return self.path[-1]
|
| -
|
| - def GetSource(self):
|
| - return open(self.filename).read()
|
| -
|
| -
|
| -class MozillaTestConfiguration(test.TestConfiguration):
|
| -
|
| - def __init__(self, context, root):
|
| - super(MozillaTestConfiguration, self).__init__(context, root)
|
| -
|
| - def ListTests(self, current_path, path, mode, variant_flags):
|
| - tests = []
|
| - for test_dir in TEST_DIRS:
|
| - current_root = join(self.root, 'data', test_dir)
|
| - for root, dirs, files in os.walk(current_root):
|
| - for dotted in [x for x in dirs if x.startswith('.')]:
|
| - dirs.remove(dotted)
|
| - for excluded in EXCLUDED:
|
| - if excluded in dirs:
|
| - dirs.remove(excluded)
|
| - dirs.sort()
|
| - root_path = root[len(self.root):].split(os.path.sep)
|
| - root_path = current_path + [x for x in root_path if x]
|
| - framework = []
|
| - for i in xrange(len(root_path)):
|
| - if i == 0: dir = root_path[1:]
|
| - else: dir = root_path[1:-i]
|
| - script = join(self.root, reduce(join, dir, ''), 'shell.js')
|
| - if exists(script):
|
| - framework.append(script)
|
| - framework.reverse()
|
| - files.sort()
|
| - for file in files:
|
| - if (not file in FRAMEWORK) and file.endswith('.js'):
|
| - full_path = root_path + [file[:-3]]
|
| - full_path = [x for x in full_path if x != 'data']
|
| - if self.Contains(path, full_path):
|
| - test = MozillaTestCase(join(root, file), full_path, self.context,
|
| - self.root, mode, framework)
|
| - tests.append(test)
|
| - return tests
|
| -
|
| - def GetBuildRequirements(self):
|
| - return ['d8']
|
| -
|
| - def GetTestStatus(self, sections, defs):
|
| - status_file = join(self.root, 'mozilla.status')
|
| - if exists(status_file):
|
| - test.ReadConfigurationInto(status_file, sections, defs)
|
| -
|
| -
|
| -def GetConfiguration(context, root):
|
| - return MozillaTestConfiguration(context, root)
|
|
|