diff options
| author | Matthew Blecker <matthewb@chromium.org> | 2020-09-30 11:42:20 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2020-10-07 20:20:22 +0000 |
| commit | 4f8947aa5be0fba7f3b9bee7a6e9dc5697f7470c (patch) | |
| tree | 3094868239506f12f092ec78cbfb640254ddf69c | |
| parent | befbf85be57f99dccb9b61ec6481726afc27eea5 (diff) | |
| download | chrome-ec-4f8947aa5be0fba7f3b9bee7a6e9dc5697f7470c.tar.gz | |
flash_ec: Add dut_control_get_or_die function.
This will be used in CL:2441395.
BRANCH=none
BUG=b:130165933
TEST=With servo_v4 Type-A + servo_micro + ampton DUT:
$ util/flash_ec --board=ampton --verbose --read="$HOME"/ampton-ec-read0.bin
Signed-off-by: Matthew Blecker <matthewb@chromium.org>
Change-Id: Iacaf8f6b3605c3f6105989b3aebd7e2fe2fedff6
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2453713
Reviewed-by: Namyoon Woo <namyoon@chromium.org>
| -rwxr-xr-x | util/flash_ec | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/util/flash_ec b/util/flash_ec index dd6250564c..20241001de 100755 --- a/util/flash_ec +++ b/util/flash_ec @@ -246,7 +246,7 @@ function dut_control() { } function dut_control_or_die { - dut_control "$@" || die "dut-control $* exited $? (non-zero)" + dut_control "$@" || die "command exited $? (non-zero): dut-control $*" } function dut_control_get() { @@ -256,7 +256,7 @@ function dut_control_get() { fi local ARGS DUT_GETVAL RETVAL - ARGS=( "${DUT_CONTROL_CMD[@]}" "-o" "${DUT_CTRL_PREFIX}$1" ) + ARGS=( "${DUT_CONTROL_CMD[@]}" "--value_only" "${DUT_CTRL_PREFIX}$1" ) RETVAL=0 # || statement is attached to avoid an exit if error exit is enabled. DUT_GETVAL=$( "${ARGS[@]}" ) || RETVAL="$?" @@ -268,6 +268,11 @@ function dut_control_get() { echo "${DUT_GETVAL}" } +function dut_control_get_or_die { + dut_control_get "$@" || \ + die "command exited $? (non-zero): dut-control --value_only $*" +} + BOARD=${FLAGS_board} in_array() { |