commit d6694c4dd683e39ead96878400a5a5067eea356f
author Kevin Shelton <kmshelton@chromium.org> Wed Feb 22 23:05:39 2023 +0000
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 14 22:54:15 2023 +0000
tree 6d4ef11ff0a2ae00cb7bc2953b030f0938d59f3e
parent 838c4e7284d34c3e8bd93bd0f6707de4fa850958

cros_run_bvt: Get clean against lint.

In preparation for possible logic changes.

BUG=b:269503867
TEST=confirmed that
`cros_run_bvt --board=atlas --debug 172.0.0.1` emits a
test_that command

Change-Id: I751e45a88a61bee189c7de57f482cbda9fa47be2
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crostestutils/+/4284681
Auto-Submit: Kevin Shelton <kmshelton@chromium.org>
Reviewed-by: Matthew Blecker <matthewb@chromium.org>
Tested-by: Kevin Shelton <kmshelton@chromium.org>
Commit-Queue: Matthew Blecker <matthewb@chromium.org>

cros_run_bvt

diff --git a/cros_run_bvt b/cros_run_bvt
index 0b5d032..52c301e 100755
--- a/cros_run_bvt
+++ b/cros_run_bvt
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2014 The Chromium OS Authors. All rights reserved.
+# Copyright 2014 The ChromiumOS Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -20,8 +20,6 @@
   "Run a minimal set of tests for sanity"
 DEFINE_boolean commit "${FLAGS_FALSE}" \
   "Run the tests required to pass the Commit Queue"
-DEFINE_boolean canary "${FLAGS_FALSE}" \
-  "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}" \
@@ -35,7 +33,7 @@
   "When running servo tests, specifies the port for contacting servod"
 
 # Parse command line; die on errors
-FLAGS_HELP="usage: $(basename $0) [flags] <hostname-or-ipaddr>"
+FLAGS_HELP="usage: $(basename "$0") [flags] <hostname-or-ipaddr>"
 FLAGS "${@}" || exit 1
 eval set -- "${FLAGS_ARGV}"
 set -e
@@ -53,15 +51,15 @@
 TESTS=( suite:{labqual,bvt-{inline,cq,perbuild,tast-cq}} )
 
 SUITE_CHECK=0
-if [ ${FLAGS_smoke} -eq ${FLAGS_TRUE} ]; then
+if [ "${FLAGS_smoke}" -eq "${FLAGS_TRUE}" ]; then
   SUITE_CHECK=$(( SUITE_CHECK + 1 ))
   TESTS=( suite:bvt-inline )
 fi
-if [ ${FLAGS_commit} -eq ${FLAGS_TRUE} ]; then
+if [ "${FLAGS_commit}" -eq "${FLAGS_TRUE}" ]; then
   SUITE_CHECK=$(( SUITE_CHECK + 1 ))
   TESTS=( suite:bvt-{inline,cq,tast-cq} )
 fi
-if [ ${FLAGS_labqual} -eq ${FLAGS_TRUE} ]; then
+if [ "${FLAGS_labqual}" -eq "${FLAGS_TRUE}" ]; then
   SUITE_CHECK=$(( SUITE_CHECK + 1 ))
   TESTS=( suite:labqual)
 
@@ -77,25 +75,25 @@
   fi
 fi
 
-if [ ${SUITE_CHECK} -gt 1 ]; then
+if [ "${SUITE_CHECK}" -gt 1 ]; then
   die "can specify at most one of --smoke --commit or --labqual"
 fi
 
 DEBUG=
-if [ ${FLAGS_debug} -eq ${FLAGS_TRUE} ]; then
-  DEBUG=echo
+if [ "${FLAGS_debug}" -eq "${FLAGS_TRUE}" ]; then
+  DEBUG="echo"
 fi
 
-$DEBUG test_that "${OPTIONS[@]}" "$DUT" "${TESTS[@]}"
+${DEBUG} test_that "${OPTIONS[@]}" "${DUT}" "${TESTS[@]}"
 AUTOTEST_STATUS=$?
 
 TAST_STATUS=0
-if [ ${FLAGS_labqual} -eq ${FLAGS_TRUE} ]; then
+if [ "${FLAGS_labqual}" -eq "${FLAGS_TRUE}" ]; then
   # Run a subset of Tast tests for qualifying a model before lab deployment.
-  $DEBUG tast -verbose run -build=false "$DUT" '("group:labqual")'
+  ${DEBUG} tast -verbose run -build=false "${DUT}" '("group:labqual")'
   TAST_STATUS=$?
 fi
 
-if [ ${AUTOTEST_STATUS} -ne 0 ] || [ ${TAST_STATUS} -ne 0 ]; then
+if [ "${AUTOTEST_STATUS}" -ne 0 ] || [ "${TAST_STATUS}" -ne 0 ]; then
   die "Autotest exited with ${AUTOTEST_STATUS}; Tast exited with ${TAST_STATUS}"
 fi