webkitpy: Rework the JSON output flags.

third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 # Copyright (C) 2010 Gabor Rapcsanyi (rgabor@inf.u-szeged.hu), University of Szeged
 # Copyright (C) 2011 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
@@ skipping 146 matching lines @@
             optparse.make_option(
                 '--driver-name',
                 type='string',
                 help='Alternative driver binary to use'),
             optparse.make_option(
                 '--full-results-html',
                 action='store_true',
                 default=False,
                 help='Show all failures in results.html, rather than only regressions'),
             optparse.make_option(
-                '--json-test-results',
-                action='store',
-                help='Path to write the JSON test results to.'),
+                '--json-test-results',              # New name from json_results_generator
+                '--write-full-results-to',          # Old argument name
+                '--isolated-script-test-output',    # Isolated API
+                help='Path to write the JSON test results for *all* tests.'),
+            # FIXME(tansell): Remove this option if nobody is found who needs it.
+            optparse.make_option(
+                '--json-failing-test-results',
+                help='Path to write the JSON test results for only *failing* tests.'),
             optparse.make_option(
                 '--new-baseline',
                 action='store_true',
                 default=False,
                 help=('Save generated results as new baselines into the *most-specific-platform* '
                       "directory, overwriting whatever's already there. Equivalent to "
                       '--reset-results --add-platform-exceptions')),
             optparse.make_option(
                 '--new-test-results',
                 action='store_true',
@@ skipping 279 matching lines @@
                 default='',
                 help=('The name of the builder shown on the waterfall running this script '
                       'e.g. WebKit.')),
             optparse.make_option(
                 '--master-name',
                 help='The name of the buildbot master.'),
             optparse.make_option(
                 '--test-results-server',
                 default='',
                 help='If specified, upload results json files to this appengine server.'),
-            optparse.make_option(
-                '--write-full-results-to',
-                help=('If specified, copy full_results.json from the results dir to the '
-                      'specified path.')),
         ]))
 
     option_parser = optparse.OptionParser()
 
     for group_name, group_options in option_group_definitions:
         option_group = optparse.OptionGroup(option_parser, group_name)
         option_group.add_options(group_options)
         option_parser.add_option_group(option_group)
 
     return option_parser.parse_args(args)
@@ skipping 119 matching lines @@
             _log.debug('\t%s', process)
 
         return run_details
 
     finally:
         printer.cleanup()
 
 if __name__ == '__main__':
     exit_code = main(sys.argv[1:], sys.stdout, sys.stderr)
     sys.exit(exit_code)