Allow layout tests to be located both in src/webkit/data/layout_tests and...

webkit/tools/layout_tests/rebaseline.py

 #!/bin/env python
 # Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Rebaselining tool that automatically produces baselines for all platforms.
 
 The script does the following for each platform specified:
   1. Compile a list of tests that need rebaselining.
   2. Download test result archive from buildbot for the platform.
@@ skipping 649 matching lines @@
         links = self._GenerateBaselineLinks(test_basename, suffix, platform)
         if links:
           row = self.HTML_TD_NOLINK % self._GetBaselineResultType(suffix)
           row += self.HTML_TD_NOLINK % platform
           row += links
           logging.debug('    html row: %s', row)
 
           rows.append(self.HTML_TR % row)
 
     if rows:
-      test_path = os.path.join(path_utils.LayoutDataDir(), test)
+      test_path = os.path.join(path_utils.LayoutTestsDir(), test)
       html = self.HTML_TR_TEST % (path_utils.FilenameToUri(test_path), test)
       html += self.HTML_TEST_DETAIL % ' '.join(rows)
 
       logging.debug('    html for test: %s', html)
       return self.HTML_TABLE_TEST % html
 
     return ''
 
   def _GetBaselineResultType(self, suffix):
     """Name of the baseline result type."""
@@ skipping 107 matching lines @@
     LogDashedString('Rebaselining result comparison started', None)
     html_generator = HtmlGenerator(options, platforms, rebaselining_tests)
     html_generator.GenerateHtml()
     html_generator.ShowHtml()
     LogDashedString('Rebaselining result comparison done', None)
 
   sys.exit(0)
 
 if '__main__' == __name__:
   main()