Cleanup run.py and config.ini.

src/test/wpt/config.ini

@@ -1,12 +1,11 @@
-#TODO: most of this doesn't really need to be configurable like this
+[products]
+servo =
+
 [web-platform-tests]
 remote_url = https://github.com/w3c/web-platform-tests.git
 branch = master
 sync_path = web-platform-tests
 
-[local]
-test_path = tests
-metadata_path = metadata
-
-[try]
-url = ssh://hg.mozilla.org/try
+[paths]
+tests = web-platform-tests
+metadata = meta

src/test/wpt/run.py

@@ -32,17 +32,13 @@ def set_defaults(args):
     args.metadata_root = args.metadata_root if args.metadata_root else wptsubdir("metadata")
     args.tests_root = args.tests_root if args.tests_root else wptsubdir("web-platform-tests")
     args.include_manifest = args.include_manifest if args.include_manifest else wptsubdir("include.ini")
-    args.binary = args.binary if args.binary else os.path.join(servo_root, "build", "servo")
     args.product = "servo"
-    args.debug_args = None
-    args.interactive = False
-    args.chunk_type = "none"
     rv = vars(args)
     wptcommandline.check_args(rv)
     return rv
 
 def main():
-    parser = wptcommandline.create_parser(product_choices=('servo',))
+    parser = wptcommandline.create_parser()
     parser.add_argument('--update-manifest', dest='update_manifest', action='store_true')
     args = parser.parse_args()
     if args.update_manifest: