Fix code that gets the Chrome SVN revision to pass in a path.

On the bots, the "." directory is not actually in an SVN checkout.
Review URL: http://codereview.chromium.org/205013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26499 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 7 deletions

diff --git a/webkit/tools/layout_tests/layout_package/json_results_generator.py b/webkit/tools/layout_tests/layout_package/json_results_generator.py
index a19dc12..4c4c6d8 100644
--- a/webkit/tools/layout_tests/layout_package/json_results_generator.py
+++ b/webkit/tools/layout_tests/layout_package/json_results_generator.py
@@ -38,7 +38,7 @@ class JSONResultsGenerator:
   TESTS = "tests"
 
   def __init__(self, failures, individual_test_timings, builder_name,
-      build_number, results_file_path, all_tests, file_dir):
+               build_number, results_file_path, all_tests):
     """
     failures: Map of test name to list of failures.
     individual_test_times: Map of test name to a tuple containing the
@@ -47,7 +47,6 @@ class JSONResultsGenerator:
     build_number: The build number for this run.
     results_file_path: Absolute path to the results json file.
     all_tests: List of all the tests that were run.
-    file_dir: directory when run_webkit_tests.py exists.
     """
     # Make sure all test paths are relative to the layout test root directory.
     self._failures = {}
@@ -67,8 +66,6 @@ class JSONResultsGenerator:
     self._build_number = build_number
     self._results_file_path = results_file_path
 
-    self._path_to_webkit = path_utils.PathFromBase('third_party', 'WebKit', 'WebCore')
-
   def _GetSVNRevision(self, in_directory=None):
     """Returns the svn revision for the given directory.
 
@@ -162,12 +159,17 @@ class JSONResultsGenerator:
 
     self._InsertItemIntoRawList(results_for_builder, self._build_number,
         self.BUILD_NUMBERS)
+
+    path_to_webkit = path_utils.PathFromBase('third_party', 'WebKit', 'WebCore')
     self._InsertItemIntoRawList(results_for_builder,
-        self._GetSVNRevision(self._path_to_webkit),
+        self._GetSVNRevision(path_to_webkit),
         self.WEBKIT_SVN)
+
+    path_to_chrome_base = path_utils.PathFromBase()
     self._InsertItemIntoRawList(results_for_builder,
-        self._GetSVNRevision(),
+        self._GetSVNRevision(path_to_chrome_base),
         self.CHROME_SVN)
+
     self._InsertItemIntoRawList(results_for_builder,
         int(time.time()),
         self.TIME)
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py
index a82d54c..ff1d024 100755
--- a/webkit/tools/layout_tests/run_webkit_tests.py
+++ b/webkit/tools/layout_tests/run_webkit_tests.py
@@ -605,7 +605,7 @@ class TestRunner:
     build_number = self._options.build_number # "12346"
     json_generator = json_results_generator.JSONResultsGenerator(failures,
         individual_test_timings, builder_name, build_number,
-        results_file_path, self._test_files_list, self._file_dir)
+        results_file_path, self._test_files_list)
     results_json = json_generator.GetJSON()
 
     results_file = open(results_file_path, "w")