Add option to check version of Chrome on target.

Add option to check version of Chrome on target.

Change-Id: I34e9d64656e04d4f5c477914512219d9b8563b78

BUG=chromium-os:9137
TEST=Ran with both wrong and right versions against a Google Chrome and
Chromium build

Committed: http://chrome-svn/viewvc/chromeos?view=rev&revision=4e75efa

[kmixter1, 2010-11-13 01:39:13]

How about a separate get_remote_chrome script (since others have asked how
to get this information)?  If you use remote_access.sh it should be pretty
short, I'd think, and then just check its response in the caller script.

On Fri, Nov 12, 2010 at 5:12 PM, <sosa@chromium.org> wrote:

> Reviewers: kmixter1,
>
> Description:
> Add option to check version of Chrome on target.
>
> Change-Id: I34e9d64656e04d4f5c477914512219d9b8563b78
>
> BUG=chromium-os:9137
> TEST=Ran with both wrong and right versions against a Google Chrome and
> Chromium build
>
> Please review this at http://codereview.chromium.org/4942001/
>
> SVN Base: http://git.chromium.org/git/crosutils.git@master
>
> Affected files:
>  M bin/cros_run_vm_test
>  M run_remote_tests.sh
>
>
> Index: bin/cros_run_vm_test
> diff --git a/bin/cros_run_vm_test b/bin/cros_run_vm_test
> index
>
fbbee23c7cbc2373d4c112a6e3d8c4be64f01aad..12689a253e73dcb9f9af25eee42e473043facb20
> 100755
> --- a/bin/cros_run_vm_test
> +++ b/bin/cros_run_vm_test
> @@ -21,6 +21,8 @@ DEFINE_string results_dir_root "" "alternate root results
> directory"
>  DEFINE_string test_case "" "Name of the test case to run"
>  DEFINE_boolean use_emerged ${FLAGS_FALSE} \
>     "Force use of emerged autotest packages"
> +DEFINE_string verify_chrome_version "" \
> +    "Verify that this chrome version matches that on vm."
>
>  set -e
>
> @@ -66,5 +68,6 @@ retry_until_ssh ${MAX_RETRIES}
>   --ssh_port=${FLAGS_ssh_port} \
>   --remote=127.0.0.1 \
>   --results_dir_root="${FLAGS_results_dir_root}" \
> +  --verify_chrome_version="${FLAGS_verify_chrome_version}" \
>   ${USE_EMERGED} \
>   "${tests[@]}"
> Index: run_remote_tests.sh
> diff --git a/run_remote_tests.sh b/run_remote_tests.sh
> index
>
babbbdceb045f371810f96c7da1063de67f90a65..141342fefa64bdb49264f923b346e7fd50b25be3
> 100755
> --- a/run_remote_tests.sh
> +++ b/run_remote_tests.sh
> @@ -24,6 +24,8 @@ DEFINE_boolean cleanup ${FLAGS_FALSE} "Clean up temp
> directory"
>  DEFINE_integer iterations 1 "Iterations to run every top level test" i
>  DEFINE_string results_dir_root "" "alternate root results directory"
>  DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v
> +DEFINE_string verify_chrome_version "" \
> +    "Verify that the version of chrome on the target matches this value."
>  DEFINE_boolean use_emerged ${FLAGS_FALSE} \
>     "Force use of emerged autotest packages"
>
> @@ -128,6 +130,21 @@ autotests directly from your source directory instead,
> pass --build."
>   fi
>  }
>
> +function verify_chrome_version() {
> +  if [ -z "${FLAGS_verify_chrome_version}" ]; then
> +    return
> +  fi
> +
> +  remote_sh "/opt/google/chrome/chrome --version"
> +  local chrome_version=$(echo ${REMOTE_OUT} | \
> +      sed 's/.* \([0-9]\+.[0-9]\+.[0-9]\+.[0-9]\+\).*/\1/')
> +  info "Target reports Chrome version ${chrome_version}"
> +  info "We are expecting Chrome version ${FLAGS_verify_chrome_version}"
> +  if [[ "${FLAGS_verify_chrome_version}" != ${chrome_version} ]]; then
> +    return 1
> +  fi
> +}
> +
>  function main() {
>   cd $(dirname "$0")
>
> @@ -159,6 +176,8 @@ function main() {
>
>   remote_access_init
>
> +  verify_chrome_version || die "Chrome version does not match!"
> +
>   learn_board
>   autotest_dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local/autotest"
>
>
>
>

[sosa, 2010-11-15 21:32:33]

PTAL

[kmixter1, 2010-11-15 22:14:02]

LGTM with minor nit

http://codereview.chromium.org/4942001/diff/9001/bin/cros_check_chrome_version
File bin/cros_check_chrome_version (right):

http://codereview.chromium.org/4942001/diff/9001/bin/cros_check_chrome_versio...
bin/cros_check_chrome_version:25: echo "${CHROME_VERSION}"
Since this file doesn't really check it, but rather extracts it, should it maybe
be called cros_get_chrome_version?