Modifications to layout test framework so that it can work with browser_tests.

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 31 matching lines @@
 from webkitpy.layout_tests.views import printing
 
 
 _log = logging.getLogger(__name__)
 
 
 
 def main(argv, stdout, stderr):
     options, args = parse_args(argv)
 
-    if options.platform and 'test' in options.platform:
+    if options.platform and 'test' in options.platform and not 'browser_test' in options.platform:

[ivandavid, 2014/07/10 22:39:09]

Without this addition to the conditional, the framework would set the wrong
host.

         # It's a bit lame to import mocks into real code, but this allows the user
         # to run tests against the test platform interactively, which is useful for
         # debugging test failures.
         from webkitpy.common.host_mock import MockHost
         host = MockHost()
     else:
         host = Host()
 
     if options.lint_test_files:
         from webkitpy.layout_tests.lint_test_expectations import run_checks
@@ skipping 193 matching lines @@
         optparse.make_option("--disable-breakpad", action="store_true",
             help="Don't use breakpad to symbolize unexpected crashes."),
         optparse.make_option("--use-apache", action="store_true",
             help="Use Apache instead of LigHTTPd (default is port-specific)."),
         optparse.make_option("--no-use-apache", action="store_false", dest="use_apache",
             help="Use LigHTTPd instead of Apache (default is port-specific)."),
         optparse.make_option("--enable-leak-detection", action="store_true",
             help="Enable the leak detection of DOM objects."),
         optparse.make_option("--enable-sanitizer", action="store_true",
             help="Only alert on sanitizer-related errors and crashes"),
+        optparse.make_option("--driver_name"),

[Dirk Pranke, 2014/07/10 23:37:13]

--driver-name exists already on line 149. Presumably this line isn't needed?

[ivandavid, 2014/07/16 21:29:01]

Oops. I was always using underscore rather than dash, which was causing the
option to not be found. I removed this code.

[ivandavid, 2014/07/16 21:29:01]

Done.

     ]))
 
     option_group_definitions.append(("Miscellaneous Options", [
         optparse.make_option("--lint-test-files", action="store_true",
         default=False, help=("Makes sure the test files parse for all "
                             "configurations. Does not run any tests.")),
     ]))
 
     # FIXME: Move these into json_results_generator.py
     option_group_definitions.append(("Result JSON Options", [
@@ skipping 99 matching lines @@
         printer.print_config(port.results_directory())
 
         run_details = manager.run(args)
         _log.debug("Testing completed, Exit status: %d" % run_details.exit_code)
         return run_details
     finally:
         printer.cleanup()
 
 if __name__ == '__main__':
     sys.exit(main(sys.argv[1:], sys.stdout, sys.stderr))