bug 1526938: geckodriver: organise args a bit more consistently; r=whimboo
authorAndreas Tolfsen <ato@sny.no>
Mon, 18 Feb 2019 12:48:45 +0000
changeset 520652 6ad3a665abdfbaf3ebc96213b4bd4febfa4b062f
parent 520651 dfb9154473caf58fb372afa0b923cca32677ec03
child 520653 e37346a0237371a6d707c27d0c7c3e4bf3dbdff1
push id2032
push userffxbld-merge
push dateMon, 13 May 2019 09:36:57 +0000
treeherdermozilla-release@455c1065dcbe [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswhimboo
bugs1526938
milestone67.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1526938: geckodriver: organise args a bit more consistently; r=whimboo Depends on D19428 Differential Revision: https://phabricator.services.mozilla.com/D19429
testing/geckodriver/src/main.rs
--- a/testing/geckodriver/src/main.rs
+++ b/testing/geckodriver/src/main.rs
@@ -110,70 +110,69 @@ macro_rules! usage {
 type ProgramResult<T> = result::Result<T, FatalError>;
 
 fn app<'a, 'b>() -> App<'a, 'b> {
     App::new(format!("geckodriver {}", build::BuildInfo))
         .about("WebDriver implementation for Firefox")
         .arg(
             Arg::with_name("webdriver_host")
                 .long("host")
+                .takes_value(true)
                 .value_name("HOST")
                 .default_value("127.0.0.1")
-                .help("Host IP to use for WebDriver server")
-                .takes_value(true),
+                .help("Host IP to use for WebDriver server"),
         )
         .arg(
             Arg::with_name("webdriver_port")
                 .short("p")
                 .long("port")
+                .takes_value(true)
                 .value_name("PORT")
                 .default_value("4444")
-                .help("Port to use for WebDriver server")
-                .takes_value(true)
+                .help("Port to use for WebDriver server"),
         )
         .arg(
             Arg::with_name("binary")
                 .short("b")
                 .long("binary")
+                .takes_value(true)
                 .value_name("BINARY")
-                .help("Path to the Firefox binary")
-                .takes_value(true),
+                .help("Path to the Firefox binary"),
         )
         .arg(
             Arg::with_name("marionette_host")
                 .long("marionette-host")
+                .takes_value(true)
                 .value_name("HOST")
                 .default_value("127.0.0.1")
-                .help("Host to use to connect to Gecko")
-                .takes_value(true)
+                .help("Host to use to connect to Gecko"),
         )
         .arg(
             Arg::with_name("marionette_port")
                 .long("marionette-port")
+                .takes_value(true)
                 .value_name("PORT")
-                .help("Port to use to connect to Gecko [default: system-allocated port]")
-                .takes_value(true),
+                .help("Port to use to connect to Gecko [default: system-allocated port]"),
         )
         .arg(
             Arg::with_name("connect_existing")
                 .long("connect-existing")
                 .requires("marionette_port")
                 .help("Connect to an existing Firefox instance"),
         )
         .arg(
             Arg::with_name("jsdebugger")
                 .long("jsdebugger")
-                .takes_value(false)
                 .help("Attach browser toolbox debugger for Firefox"),
         )
         .arg(
             Arg::with_name("verbosity")
-                .short("v")
                 .multiple(true)
                 .conflicts_with("log_level")
+                .short("v")
                 .help("Log level verbosity (-v for debug and -vv for trace level)"),
         )
         .arg(
             Arg::with_name("log_level")
                 .long("log")
                 .takes_value(true)
                 .value_name("LEVEL")
                 .possible_values(&["fatal", "error", "warn", "info", "config", "debug", "trace"])