| OLD | NEW |
| 1 #!/bin/bash | 1 #!/bin/bash |
| 2 | 2 |
| 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. | 3 # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 # | 6 # |
| 7 # Runs a given test case under a VM. | 7 # Runs a given test case under a VM. |
| 8 | 8 |
| 9 . "$(dirname $0)/../common.sh" | 9 . "$(dirname $0)/../common.sh" |
| 10 . "$(dirname $0)/../lib/cros_vm_lib.sh" | 10 . "$(dirname $0)/../lib/cros_vm_lib.sh" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 info "Checking for ssh access to virtual machine." | 70 info "Checking for ssh access to virtual machine." |
| 71 retry_until_ssh ${MAX_RETRIES} | 71 retry_until_ssh ${MAX_RETRIES} |
| 72 | 72 |
| 73 if [ -n "${FLAGS_verify_chrome_version}" ]; then | 73 if [ -n "${FLAGS_verify_chrome_version}" ]; then |
| 74 info "Verifying version of Chrome matches what we expect." | 74 info "Verifying version of Chrome matches what we expect." |
| 75 if chrome_version_is_valid "${FLAGS_verify_chrome_version}"; then | 75 if chrome_version_is_valid "${FLAGS_verify_chrome_version}"; then |
| 76 chrome_version_on_vm=$("$(dirname $0)/cros_get_chrome_version" \ | 76 chrome_version_on_vm=$("$(dirname $0)/cros_get_chrome_version" \ |
| 77 --remote=127.0.0.1 \ | 77 --remote=127.0.0.1 \ |
| 78 --ssh_port=${FLAGS_ssh_port}) | 78 --ssh_port=${FLAGS_ssh_port}) |
| 79 [[ ${chrome_version_on_vm} == ${FLAGS_verify_chrome_version} ]] || \ | 79 [[ ${chrome_version_on_vm} == ${FLAGS_verify_chrome_version} ]] || \ |
| 80 die "Chrome version mismatch. VM reported ${chrome_version_on_vm}" | 80 warn "CHROME_VERSION is no longer set.This check will be removed" |
| 81 else | 81 else |
| 82 warn "${FLAGS_verify_chrome_version} is not a valid Chrome version" | 82 warn "${FLAGS_verify_chrome_version} is not a valid Chrome version" |
| 83 fi | 83 fi |
| 84 fi | 84 fi |
| 85 | 85 |
| 86 "$(dirname $0)"/../run_remote_tests.sh \ | 86 "$(dirname $0)"/../run_remote_tests.sh \ |
| 87 --board=${FLAGS_board} \ | 87 --board=${FLAGS_board} \ |
| 88 --ssh_port=${FLAGS_ssh_port} \ | 88 --ssh_port=${FLAGS_ssh_port} \ |
| 89 --remote=127.0.0.1 \ | 89 --remote=127.0.0.1 \ |
| 90 --results_dir_root="${FLAGS_results_dir_root}" \ | 90 --results_dir_root="${FLAGS_results_dir_root}" \ |
| 91 ${USE_EMERGED} \ | 91 ${USE_EMERGED} \ |
| 92 "${tests[@]}" | 92 "${tests[@]}" |
| OLD | NEW |