cros_run_bvt: Remove the --canary option

Calling --canary makes the script run the default suites, remove the
unnecessary argument to simplify the script.

BUG=b:184991316
TEST=cros_workon --host start cros-testutils
TEST=sudo emerge chromeos-base/cros-testutils
TEST=cros_run_bvt --board ${BOARD} --debug ${DUT} prints the expected
commands
TEST=cros_run_bvt --board ${BOARD} --debug --labqual ${DUT} prints the
expected commands
TEST=cros_run_bvt --board ${BOARD} --debug --canary ${DUT} prints the
expected commands

Change-Id: I53cf514bb747540596313031b8d86b622741717c
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crostestutils/+/2841972
Tested-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Reviewed-by: Kevin Shelton <kmshelton@chromium.org>
diff --git a/cros_run_bvt b/cros_run_bvt
index 40956e4..83156ef 100755
--- a/cros_run_bvt
+++ b/cros_run_bvt
@@ -21,7 +21,7 @@
 DEFINE_boolean commit "${FLAGS_FALSE}" \
   "Run the tests required to pass the Commit Queue"
 DEFINE_boolean canary "${FLAGS_FALSE}" \
-  "Run all tests required for canary builds to pass"
+  "Deprecated/unused argument. Doesn't have any effect"
 DEFINE_boolean labqual "${FLAGS_FALSE}" \
   "Run the BVT tests required for lab qualification"
 DEFINE_boolean debug "${FLAGS_FALSE}" \
@@ -61,10 +61,6 @@
   SUITE_CHECK=$(( SUITE_CHECK + 1 ))
   TESTS=( suite:bvt-{inline,cq,tast-cq} )
 fi
-if [ ${FLAGS_canary} -eq ${FLAGS_TRUE} ]; then
-  SUITE_CHECK=$(( SUITE_CHECK + 1 ))
-  # Use the default tests.
-fi
 if [ ${FLAGS_labqual} -eq ${FLAGS_TRUE} ]; then
   SUITE_CHECK=$(( SUITE_CHECK + 1 ))
   TESTS=( suite:labqual)
@@ -82,7 +78,7 @@
 fi
 
 if [ ${SUITE_CHECK} -gt 1 ]; then
-  die "can specify at most one of --smoke --commit --canary or --labqual"
+  die "can specify at most one of --smoke --commit or --labqual"
 fi
 
 DEBUG=