| Index: test/preparser/testcfg.py
 | 
| diff --git a/test/preparser/testcfg.py b/test/preparser/testcfg.py
 | 
| index 61c14c9bd3ca80f71f4598a4c6b3e6f470fd3da8..566fd5ca442cbf9ebcbc5d9511a1768d6e9c9f4f 100644
 | 
| --- a/test/preparser/testcfg.py
 | 
| +++ b/test/preparser/testcfg.py
 | 
| @@ -42,7 +42,7 @@ class PreparserTestSuite(testsuite.TestSuite):
 | 
|      return "preparser"
 | 
|  
 | 
|    def _GetExpectations(self):
 | 
| -    expects_file = join(self.root, "preparser.expectation")
 | 
| +    expects_file = os.path.join(self.root, "preparser.expectation")
 | 
|      expectations_map = {}
 | 
|      if not os.path.exists(expects_file): return expectations_map
 | 
|      rule_regex = re.compile("^([\w\-]+)(?::([\w\-]+))?(?::(\d+),(\d+))?$")
 | 
| @@ -58,7 +58,7 @@ class PreparserTestSuite(testsuite.TestSuite):
 | 
|      return expectations_map
 | 
|  
 | 
|    def _ParsePythonTestTemplates(self, result, filename):
 | 
| -    pathname = join(self.root, filename + ".pyt")
 | 
| +    pathname = os.path.join(self.root, filename + ".pyt")
 | 
|      def Test(name, source, expectation):
 | 
|        source = source.replace("\n", " ")
 | 
|        testname = os.path.join(filename, name)
 | 
| @@ -118,143 +118,3 @@ class PreparserTestSuite(testsuite.TestSuite):
 | 
|  
 | 
|  def GetSuite(name, root):
 | 
|    return PreparserTestSuite(name, root)
 | 
| -
 | 
| -
 | 
| -# Deprecated definitions below.
 | 
| -# TODO(jkummerow): Remove when SCons is no longer supported.
 | 
| -
 | 
| -
 | 
| -from os.path import join, exists, isfile
 | 
| -import test
 | 
| -
 | 
| -
 | 
| -class PreparserTestCase(test.TestCase):
 | 
| -
 | 
| -  def __init__(self, root, path, executable, mode, throws, context, source):
 | 
| -    super(PreparserTestCase, self).__init__(context, path, mode)
 | 
| -    self.executable = executable
 | 
| -    self.root = root
 | 
| -    self.throws = throws
 | 
| -    self.source = source
 | 
| -
 | 
| -  def GetLabel(self):
 | 
| -    return "%s %s %s" % (self.mode, self.path[-2], self.path[-1])
 | 
| -
 | 
| -  def GetName(self):
 | 
| -    return self.path[-1]
 | 
| -
 | 
| -  def HasSource(self):
 | 
| -    return self.source is not None
 | 
| -
 | 
| -  def GetSource(self):
 | 
| -    return self.source
 | 
| -
 | 
| -  def BuildCommand(self, path):
 | 
| -    if (self.source is not None):
 | 
| -      result = [self.executable, "-e", self.source]
 | 
| -    else:
 | 
| -      testfile = join(self.root, self.GetName()) + ".js"
 | 
| -      result = [self.executable, testfile]
 | 
| -    if (self.throws):
 | 
| -      result += ['throws'] + self.throws
 | 
| -    return result
 | 
| -
 | 
| -  def GetCommand(self):
 | 
| -    return self.BuildCommand(self.path)
 | 
| -
 | 
| -  def Run(self):
 | 
| -    return test.TestCase.Run(self)
 | 
| -
 | 
| -
 | 
| -class PreparserTestConfiguration(test.TestConfiguration):
 | 
| -
 | 
| -  def __init__(self, context, root):
 | 
| -    super(PreparserTestConfiguration, self).__init__(context, root)
 | 
| -
 | 
| -  def GetBuildRequirements(self):
 | 
| -    return ['preparser']
 | 
| -
 | 
| -  def GetExpectations(self):
 | 
| -    expects_file = join(self.root, 'preparser.expectation')
 | 
| -    map = {}
 | 
| -    if exists(expects_file):
 | 
| -      rule_regex = re.compile("^([\w\-]+)(?::([\w\-]+))?(?::(\d+),(\d+))?$")
 | 
| -      for line in utils.ReadLinesFrom(expects_file):
 | 
| -        if (line[0] == '#'): continue
 | 
| -        rule_match = rule_regex.match(line)
 | 
| -        if rule_match:
 | 
| -          expects = []
 | 
| -          if (rule_match.group(2)):
 | 
| -            expects = expects + [rule_match.group(2)]
 | 
| -            if (rule_match.group(3)):
 | 
| -              expects = expects + [rule_match.group(3), rule_match.group(4)]
 | 
| -          map[rule_match.group(1)] = expects
 | 
| -    return map;
 | 
| -
 | 
| -  def ParsePythonTestTemplates(self, result, filename,
 | 
| -                               executable, current_path, mode):
 | 
| -    pathname = join(self.root, filename + ".pyt")
 | 
| -    def Test(name, source, expectation):
 | 
| -      throws = None
 | 
| -      if (expectation is not None):
 | 
| -        throws = [expectation]
 | 
| -      test = PreparserTestCase(self.root,
 | 
| -                               current_path + [filename, name],
 | 
| -                               executable,
 | 
| -                               mode, throws, self.context,
 | 
| -                               source.replace("\n", " "))
 | 
| -      result.append(test)
 | 
| -    def Template(name, source):
 | 
| -      def MkTest(replacement, expectation):
 | 
| -        testname = name
 | 
| -        testsource = source
 | 
| -        for key in replacement.keys():
 | 
| -          testname = testname.replace("$"+key, replacement[key]);
 | 
| -          testsource = testsource.replace("$"+key, replacement[key]);
 | 
| -        Test(testname, testsource, expectation)
 | 
| -      return MkTest
 | 
| -    execfile(pathname, {"Test": Test, "Template": Template})
 | 
| -
 | 
| -  def ListTests(self, current_path, path, mode, variant_flags):
 | 
| -    executable = 'preparser'
 | 
| -    if utils.IsWindows():
 | 
| -      executable += '.exe'
 | 
| -    executable = join(self.context.buildspace, executable)
 | 
| -    if not isfile(executable):
 | 
| -      executable = join('obj', 'preparser', mode, 'preparser')
 | 
| -      if utils.IsWindows():
 | 
| -        executable += '.exe'
 | 
| -      executable = join(self.context.buildspace, executable)
 | 
| -    expectations = self.GetExpectations()
 | 
| -    result = []
 | 
| -    # Find all .js files in tests/preparser directory.
 | 
| -    filenames = [f[:-3] for f in os.listdir(self.root) if f.endswith(".js")]
 | 
| -    filenames.sort()
 | 
| -    for file in filenames:
 | 
| -      throws = None;
 | 
| -      if (file in expectations):
 | 
| -        throws = expectations[file]
 | 
| -      result.append(PreparserTestCase(self.root,
 | 
| -                                      current_path + [file], executable,
 | 
| -                                      mode, throws, self.context, None))
 | 
| -    # Find all .pyt files in test/preparser directory.
 | 
| -    filenames = [f[:-4] for f in os.listdir(self.root) if f.endswith(".pyt")]
 | 
| -    filenames.sort()
 | 
| -    for file in filenames:
 | 
| -      # Each file as a python source file to be executed in a specially
 | 
| -      # created environment (defining the Template and Test functions)
 | 
| -      self.ParsePythonTestTemplates(result, file,
 | 
| -                                    executable, current_path, mode)
 | 
| -    return result
 | 
| -
 | 
| -  def GetTestStatus(self, sections, defs):
 | 
| -    status_file = join(self.root, 'preparser.status')
 | 
| -    if exists(status_file):
 | 
| -      test.ReadConfigurationInto(status_file, sections, defs)
 | 
| -
 | 
| -  def VariantFlags(self):
 | 
| -    return [[]];
 | 
| -
 | 
| -
 | 
| -def GetConfiguration(context, root):
 | 
| -  return PreparserTestConfiguration(context, root)
 | 
| 
 |