diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 00:10:55 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-25 00:10:55 +0000 |
| commit | 9fe24ece4042c39bc16bed8af10a4f5940c4f118 (patch) | |
| tree | ef0d86b6079990791aa6529bf2ede85871450d3f | |
| parent | f495d8083fa74200057645844d694f528ddf5324 (diff) | |
| download | chromium_src-9fe24ece4042c39bc16bed8af10a4f5940c4f118.zip chromium_src-9fe24ece4042c39bc16bed8af10a4f5940c4f118.tar.gz chromium_src-9fe24ece4042c39bc16bed8af10a4f5940c4f118.tar.bz2 | |
Make paths in JSON all be unix-style. This is done here instead of
in the consumer (the layout tests dashboard) since the dashboard is
already too slow.
Also, log starting and stopping of generating the JSON files so
we can know if they start taking a long time to generate.
Review URL: http://codereview.chromium.org/174366
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24182 0039d316-1c4b-4281-b951-d872f2087c98
3 files changed, 10 insertions, 2 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 8a2e973..83bfb882 100644 --- a/webkit/tools/layout_tests/layout_package/json_results_generator.py +++ b/webkit/tools/layout_tests/layout_package/json_results_generator.py @@ -73,9 +73,12 @@ class JSONResultsGenerator: if index is -1: # Already a relative path. - return test + relativePath = test + else: + relativePath = test[index + 1:] - return test[index + 1:] + # Make sure all paths are unix-style. + return relativePath.replace('\\', '/') def GetJSON(self): """Gets the results for the results.json file.""" diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py index d3beea8..5418ea18 100644 --- a/webkit/tools/layout_tests/layout_package/test_expectations.py +++ b/webkit/tools/layout_tests/layout_package/test_expectations.py @@ -478,6 +478,8 @@ class TestExpectationsFile: return False def _AddToAllExpectations(self, test, options, expectations): + # Make all paths unix-style so the dashboard doesn't need to. + test = test.replace('\\', '/') if not test in self._all_expectations: self._all_expectations[test] = [] self._all_expectations[test].append( diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 449cc68..dbcb9bf 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -581,6 +581,7 @@ class TestRunner: return len(regressions) def _WriteJSONFiles(self, failures, individual_test_timings): + logging.debug("Writing JSON files in %s." % self._options.results_directory) # Write a json file of the test_expectations.txt file for the layout tests # dashboard. expectations_file = open(os.path.join(self._options.results_directory, @@ -602,6 +603,8 @@ class TestRunner: results_file.write(results_json) results_file.close() + logging.debug("Finished writing JSON files.") + def _PrintTimingStatistics(self, directory_test_timings, individual_test_timings, failures): self._PrintAggregateTestStatistics(individual_test_timings) |