diff options
| author | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-24 19:05:43 +0000 |
|---|---|---|
| committer | ojan@google.com <ojan@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-08-24 19:05:43 +0000 |
| commit | f93d5507d91af9372f29321829527390c4bd8660 (patch) | |
| tree | 81c9f7de0abee302b05df8b8e258674b9cf65240 /webkit/tools/layout_tests/run_webkit_tests.py | |
| parent | deaa2b89a8457e90c034ae1f96399bd5ba1b5e8f (diff) | |
| download | chromium_src-f93d5507d91af9372f29321829527390c4bd8660.zip chromium_src-f93d5507d91af9372f29321829527390c4bd8660.tar.gz chromium_src-f93d5507d91af9372f29321829527390c4bd8660.tar.bz2 | |
Reverting 24120.
Review URL: http://codereview.chromium.org/173280
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@24124 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/layout_tests/run_webkit_tests.py')
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 449cc68..c157ac9 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -585,7 +585,11 @@ class TestRunner: # dashboard. expectations_file = open(os.path.join(self._options.results_directory, "expectations.json"), "w") - expectations_json = self._expectations.GetExpectationsJsonForAllPlatforms() + # TODO(ojan): Generate JSON using a JSON library instead of relying on + # GetExpectationsForAllPlatforms returning an object that only uses + # primitive types. + expectations_json = repr( + self._expectations.GetExpectationsForAllPlatforms()) expectations_file.write(("ADD_EXPECTATIONS(" + expectations_json + ");")) expectations_file.close() @@ -594,8 +598,7 @@ class TestRunner: builder_name = self._options.builder_name # "WebKitBuilder" 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) + individual_test_timings, builder_name, build_number, results_file_path) results_json = json_generator.GetJSON() results_file = open(results_file_path, "w") @@ -1172,10 +1175,10 @@ if '__main__' == __name__: help=("Run a the tests in batches (n), after every " "n tests, the test shell is relaunched.")) option_parser.add_option("", "--builder-name", - default="DUMMY_BUILDER_NAME", + default=None, help="The name of the builder running this script.") option_parser.add_option("", "--build-number", - default="DUMMY_BUILD_NUMBER", + default=None, help=("The build number of the builder running" "this script.")) option_parser.add_option("", "--find-baselines", action="store_true", |