learn board and print better status messages

src/scripts/run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to run client or server tests on a live remote image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 65 matching lines @@
     return;
   fi
 
   for status_file in $(echo "${results_dir}"/*/status); do
     local keyval_file=$(dirname $status_file)/keyval
     echo "Updating ${keyval_file}"
     echo "${attribute_name}=${attribute_value}" >> "${keyval_file}"
   done
 }
 
+
+# Ask the target what board it is
+function learn_board() {
+  if [[ -n "${FLAGS_board}" ]]; then
+    return
+  fi
+  remote_sh grep CHROMEOS_RELEASE_BOARD /etc/lsb-release
+  FLAGS_board=$(echo "${REMOTE_OUT}" | cut -d= -f2)
+  if [[ -z "${FLAGS_board}" ]]; then
+    check_board
+  fi
+  echo "Target reports board is ${FLAGS_board}"
+}
+
+
 function main() {
   assert_outside_chroot
 
   cd $(dirname "$0")
 
   FLAGS "$@" || exit 1
 
   if [[ -z "${FLAGS_ARGV}" ]]; then
     echo "Please specify tests to run, like:"
     echo "  $0 --remote=MyMachine SystemBootPerf"
     exit 1
   fi
 
   set -e
 
   # Set global TMP for remote_access.sh's sake
   TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
 
   rm -f "${FLAGS_output_file}"
 
   trap cleanup EXIT
 
+  remote_access_init
+
   local autotest_dir=""
   if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
-    check_board
+    learn_board
     # Always copy into installed autotest directory.  This way if a user
     # is just modifying scripts, they take effect without having to wait
     # for the laborious build_autotest.sh command.
     local original="${GCLIENT_ROOT}/src/third_party/autotest/files"
     autotest_dir="${FLAGS_chroot}/build/${FLAGS_board}/usr/local/autotest"
     update_chroot_autotest "${original}" "${autotest_dir}"
   else
     autotest_dir="${FLAGS_prepackaged_autotest}"
   fi
 
@@ skipping 24 matching lines @@
       echo "${finds}"
       exit 1
     fi
     for i in $(seq 1 $FLAGS_iterations); do
       control_files_to_run="${control_files_to_run} '${finds}'"
     done
   done
 
   echo "Running the following control files: ${control_files_to_run}"
 
-  remote_access_init
-
   # Set the default machine description to the machine's IP
   if [[ -z "${FLAGS_machine_desc}" ]]; then
     FLAGS_machine_desc="${FLAGS_remote}"
   fi
 
   if [[ -z "${FLAGS_results_dir_root}" ]]; then
     FLAGS_results_dir_root="${TMP}"
   fi
 
   mkdir -p "${FLAGS_results_dir_root}"
@@ skipping 18 matching lines @@
     local results_dir_name="${short_name},${FLAGS_machine_desc},${start_time}"
     local results_dir="${FLAGS_results_dir_root}/${results_dir_name}"
     rm -rf "${results_dir}"
     local verbose=""
     if [[ ${FLAGS_verbose} -eq $FLAGS_TRUE ]]; then
       verbose="--verbose"
     fi
 
     ${autoserv} -m "${FLAGS_remote}" "${option}" "${control_file}" \
       -r "${results_dir}" ${verbose}
-    local test_status="${results_dir}/status"
+    local test_status="${results_dir}/status.log"
     local test_result_dir="${results_dir}/${short_name}"
     local keyval_file="${test_result_dir}/results/keyval"
     if is_successful_test "${test_status}"; then
       echo "${control_file} succeeded." | tee -a "${FLAGS_output_file}"
       if [[ -f "${keyval_file}" ]]; then
         echo "Keyval was:" | tee -a "${FLAGS_output_file}"
         cat "${keyval_file}" | tee -a "${FLAGS_output_file}"
       fi
     else
       echo "${control_file} failed:" | tee -a "${FLAGS_output_file}"
@@ skipping 13 matching lines @@
         echo "Parse failed." | tee -a "${FLAGS_output_file}"
         FLAGS_cleanup=${FLAGS_FALSE}
       fi
     fi
   done
 
   echo "Output stored to ${FLAGS_output_file}"
 }
 
 main $@