From f19cab1479907e39d8cdcd2761943fab09de862c Mon Sep 17 00:00:00 2001 From: Paul Irish Date: Tue, 6 Feb 2018 09:51:16 -0800 Subject: [PATCH] misc(package): scripts don't require "--" for options to be forwarded --- lighthouse-cli/test/smokehouse/a11y/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/offline-local/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/perf/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/redirects/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/seo/run-tests.sh | 2 +- lighthouse-cli/test/smokehouse/tricky-ttci/run-tests.sh | 2 +- lighthouse-core/scripts/compile-against-devtools.sh | 2 +- lighthouse-core/scripts/roll-to-devtools.sh | 4 ++-- package.json | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lighthouse-cli/test/smokehouse/a11y/run-tests.sh b/lighthouse-cli/test/smokehouse/a11y/run-tests.sh index f51c4c704949..604b434437d9 100755 --- a/lighthouse-cli/test/smokehouse/a11y/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/a11y/run-tests.sh @@ -7,7 +7,7 @@ sleep 0.5s config="lighthouse-cli/test/smokehouse/a11y/a11y-config.js" expectations="lighthouse-cli/test/smokehouse/a11y/expectations.js" -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh b/lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh index c007f88d2762..960cb6f8c12f 100755 --- a/lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/byte-efficiency/run-tests.sh @@ -7,7 +7,7 @@ sleep 0.5s config="lighthouse-cli/test/smokehouse/byte-config.js" expectations="lighthouse-cli/test/smokehouse/byte-efficiency/expectations.js" -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh b/lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh index 3869d8d9acd6..fd7acaa12ac3 100755 --- a/lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/dobetterweb/run-tests.sh @@ -8,7 +8,7 @@ config="lighthouse-cli/test/smokehouse/dbw-config.js" expectations="lighthouse-cli/test/smokehouse/dobetterweb/dbw-expectations.js" # run smoketest on DBW test page. -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/offline-local/run-tests.sh b/lighthouse-cli/test/smokehouse/offline-local/run-tests.sh index 5e6c7ff1d9d6..b2a89d5c7994 100755 --- a/lighthouse-cli/test/smokehouse/offline-local/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/offline-local/run-tests.sh @@ -8,7 +8,7 @@ config="lighthouse-cli/test/smokehouse/offline-config.js" expectations="lighthouse-cli/test/smokehouse/offline-local/offline-expectations.js" # run smoketest, expecting results found in offline-expectations -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/perf/run-tests.sh b/lighthouse-cli/test/smokehouse/perf/run-tests.sh index c81751a9377f..8ae823a0597a 100644 --- a/lighthouse-cli/test/smokehouse/perf/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/perf/run-tests.sh @@ -7,7 +7,7 @@ sleep 0.5s config="lighthouse-core/config/perf.json" expectations="lighthouse-cli/test/smokehouse/perf/expectations.js" -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/redirects/run-tests.sh b/lighthouse-cli/test/smokehouse/redirects/run-tests.sh index d8dcb12b54eb..89bdee363ae5 100755 --- a/lighthouse-cli/test/smokehouse/redirects/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/redirects/run-tests.sh @@ -8,7 +8,7 @@ config="lighthouse-cli/test/smokehouse/redirects-config.js" expectations="lighthouse-cli/test/smokehouse/redirects/expectations.js" # run smoketest, expecting results found in offline-expectations -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/seo/run-tests.sh b/lighthouse-cli/test/smokehouse/seo/run-tests.sh index dc5f9d0fe7a8..4d101bf23425 100755 --- a/lighthouse-cli/test/smokehouse/seo/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/seo/run-tests.sh @@ -7,7 +7,7 @@ sleep 0.5s config="lighthouse-cli/test/smokehouse/seo-config.js" expectations="lighthouse-cli/test/smokehouse/seo/expectations.js" -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-cli/test/smokehouse/tricky-ttci/run-tests.sh b/lighthouse-cli/test/smokehouse/tricky-ttci/run-tests.sh index 8bb367b73012..265b0b326bad 100644 --- a/lighthouse-cli/test/smokehouse/tricky-ttci/run-tests.sh +++ b/lighthouse-cli/test/smokehouse/tricky-ttci/run-tests.sh @@ -7,7 +7,7 @@ sleep 0.5s config="lighthouse-core/config/default.js" expectations="lighthouse-cli/test/smokehouse/tricky-ttci/expectations.js" -yarn smokehouse -- --config-path=$config --expectations-path=$expectations +yarn smokehouse --config-path=$config --expectations-path=$expectations exit_code=$? # kill test servers diff --git a/lighthouse-core/scripts/compile-against-devtools.sh b/lighthouse-core/scripts/compile-against-devtools.sh index 2d05c425d176..c4c004df86ef 100644 --- a/lighthouse-core/scripts/compile-against-devtools.sh +++ b/lighthouse-core/scripts/compile-against-devtools.sh @@ -42,7 +42,7 @@ cd "$protocol_path" && git reset --hard && git fetch origin master && git checko cd "$lhroot_path" || exit 1 # copy renderer and lh backgrond into this devtools checkout -yarn devtools -- "$frontend_path/front_end/" +yarn devtools "$frontend_path/front_end/" # # monkeypatch the audits2 module.json to include any new files we're added that aren't present diff --git a/lighthouse-core/scripts/roll-to-devtools.sh b/lighthouse-core/scripts/roll-to-devtools.sh index 28b27c0893e9..d52970a66dc2 100755 --- a/lighthouse-core/scripts/roll-to-devtools.sh +++ b/lighthouse-core/scripts/roll-to-devtools.sh @@ -11,13 +11,13 @@ # yarn devtools # with a custom devtools front_end location: -# yarn devtools -- node_modules/temp-devtoolsfrontend/front_end/ +# yarn devtools node_modules/temp-devtoolsfrontend/front_end/ chromium_dir="$HOME/chromium/src" if [[ -n "$1" ]]; then frontend_dir="$1" -else +else frontend_dir="$chromium_dir/third_party/WebKit/Source/devtools/front_end" fi diff --git a/package.json b/package.json index 8dc4e5356888..b3c28161b50c 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "compile-devtools": "bash lighthouse-core/scripts/compile-against-devtools.sh", "watch": "bash lighthouse-core/scripts/run-mocha.sh --watch", "chrome": "node chrome-launcher/manual-chrome-launcher.js", - "fast": "yarn start -- --disable-device-emulation --disable-cpu-throttling --disable-network-throttling", + "fast": "yarn start --disable-device-emulation --disable-cpu-throttling --disable-network-throttling", "smokehouse": "node lighthouse-cli/test/smokehouse/smokehouse.js", "deploy-viewer": "cd lighthouse-viewer && gulp deploy", "bundlesize": "bundlesize",