http_server_driver and benchmark_builder should not be in run-benchmark's plan files
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Aug 2015 23:40:49 +0000 (23:40 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 6 Aug 2015 23:40:49 +0000 (23:40 +0000)
commit816306f0b1454aefcecaa5866c9da958cee3724b
treea0483c09f7a947f6f8dfd3f6c93f3a69cfe6a1ae
parentcbb848c90662f1e7b897eb89122b22cc901e28c5
http_server_driver and benchmark_builder should not be in run-benchmark's plan files
https://bugs.webkit.org/show_bug.cgi?id=147752

Reviewed by Chris Dumez.

Removed BenchmarkBuilderFactory since we have exactly one subclass of BenchmarkBuilder.

Also made HTTPServerDriverFactory instantiate the appropriate HTTP server based on the platform name instead of HTTP server name.
This allows us to remove --http-server-driver option from run-benchmark, which was added to support the HTTP server for iOS.

* Scripts/webkitpy/benchmark_runner/benchmark_builder: Removed.
* Scripts/webkitpy/benchmark_runner/benchmark_builder.py: Moved from benchmark_runner/benchmark_builder/generic_benchmark_builder.py.
* Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py: Removed.
* Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py: Removed.
* Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py: Moved to benchmark_runner/benchmark_builder.py.
* Scripts/webkitpy/benchmark_runner/benchmark_runner.py:
(BenchmarkRunner.__init__): No longer takes http_server_driver_override as an argument since this is not handled by
HTTPServerDriverFactory taking the platform name as an argument.
(BenchmarkRunner.execute): Directly instantiate BenchmarkBuilder.
* Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-cssquery.plan: Removed http_server_driver and benchmark_builder.
* Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-dom.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-jslib.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/jsbench.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/kraken.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/octane.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/speedometer.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan: Ditto.
* Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py:
(http_server_driver_loader): Register http server drivers via supported platform names instead of http server names.
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py:
(HTTPServerDriver): Replaced name by platforms.
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver): Ditto.
* Scripts/webkitpy/benchmark_runner/run_benchmark.py:
(parse_args): Removed --http-server-driver option.
(start): Ditto.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@188092 268f45cc-cd09-0410-ab3c-d52691b4dbfc
18 files changed:
Tools/ChangeLog
Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder.py [moved from Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/generic_benchmark_builder.py with 97% similarity]
Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/__init__.py [deleted file]
Tools/Scripts/webkitpy/benchmark_runner/benchmark_builder/benchmark_builder_factory.py [deleted file]
Tools/Scripts/webkitpy/benchmark_runner/benchmark_runner.py
Tools/Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-cssquery.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-dom.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/dromaeo-jslib.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/jetstream.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/jsbench.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/kraken.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/octane.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/speedometer.plan
Tools/Scripts/webkitpy/benchmark_runner/data/plans/sunspider.plan
Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/__init__.py
Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server_driver.py
Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py
Tools/Scripts/webkitpy/benchmark_runner/run_benchmark.py