Add --quiet to run_remote_tests, and use it

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 24 matching lines @@
 get_default_board
 
 DEFINE_string args "" \
     "Command line arguments for test. Quoted and space separated if multiple." a
 DEFINE_string board "$DEFAULT_BOARD" \
     "The board for which you are building autotest"
 DEFINE_boolean build ${FLAGS_FALSE} "Build tests while running" b
 DEFINE_string chroot "${DEFAULT_CHROOT_DIR}" "alternate chroot location" c
 DEFINE_boolean cleanup ${FLAGS_FALSE} "Clean up temp directory"
 DEFINE_integer iterations 1 "Iterations to run every top level test" i
+DEFINE_boolean quiet ${FLAGS_FALSE} "Hide most test logs on success"

[sosa, 2011/02/15 22:16:47]

maybe hide_info?

 DEFINE_string results_dir_root "" "alternate root results directory"
 DEFINE_boolean verbose ${FLAGS_FALSE} "Show verbose autoserv output" v
 DEFINE_boolean use_emerged ${FLAGS_FALSE} \
     "Force use of emerged autotest packages"
 
 RAN_ANY_TESTS=${FLAGS_FALSE}
 
 function stop_ssh_agent() {
   # Call this function from the exit trap of the main script.
   # Iff we started ssh-agent, be nice and clean it up.
   # Note, only works if called from the main script - no subshells.
   if [[ 1 -eq ${OWN_SSH_AGENT} ]]; then
     kill ${SSH_AGENT_PID} 2>/dev/null
     unset OWN_SSH_AGENT SSH_AGENT_PID SSH_AUTH_SOCK
   fi
 }
 
 function start_ssh_agent() {
   local tmp_private_key=$TMP/autotest_key
   if [ -z "$SSH_AGENT_PID" ]; then
     eval $(ssh-agent)
     OWN_SSH_AGENT=1
   else
     OWN_SSH_AGENT=0
   fi
   cp $FLAGS_private_key $tmp_private_key
   chmod 0400 $tmp_private_key
-  ssh-add $tmp_private_key
+
+  # Run this way to capture normal stderr output but only display it
+  # on failure.
+  result="$(ssh-add $tmp_private_key 2>&1)" || die "$result"
 }
 
 function cleanup() {
   # Always remove the build path in case it was used.
   [[ -n "${BUILD_DIR}" ]] && sudo rm -rf "${BUILD_DIR}"
   if [[ $FLAGS_cleanup -eq ${FLAGS_TRUE} ]] || \
      [[ ${RAN_ANY_TESTS} -eq ${FLAGS_FALSE} ]]; then
     rm -rf "${TMP}"
   else
     echo ">>> Details stored under ${TMP}"
@@ skipping 229 matching lines @@
     fi
 
     local autoserv_args="-m ${FLAGS_remote} --ssh-port ${FLAGS_ssh_port} \
         ${option} ${control_file} -r ${results_dir} ${verbose}"
     if [ -n "${FLAGS_args}" ]; then
       autoserv_args="${autoserv_args} --args=${FLAGS_args}"
     fi
 
     sudo chmod a+w ./server/{tests,site_tests}
     echo ./server/autoserv ${autoserv_args}
+    
+    # run autoserv in subshell, capture it's output, and only display output
+    # on error.
+    if [ ${FLAGS_build} -eq ${FLAGS_TRUE} ]; then
+      result="$(. ${BUILD_ENV} && tc-export CC CXX PKG_CONFIG &&
+                ./server/autoserv ${autoserv_args} 2>&1)" 
+    else
+      result="$(./server/autoserv ${autoserv_args} 2>&1)"

[sosa, 2011/02/15 22:16:47]

I'm not sure this'll work with || to some var ... i.e. DO something || error=1
... if $error -eq 1.  Set -e would kick in before you could check for $?
otherwise

+    fi
 
-    if [ ${FLAGS_build} -eq ${FLAGS_TRUE} ]; then
-      # run autoserv in subshell
-      (. ${BUILD_ENV} && tc-export CC CXX PKG_CONFIG &&
-       ./server/autoserv ${autoserv_args})
-    else
-      ./server/autoserv ${autoserv_args}
+    if [ $? -ne 0 -o ${FLAGS_quiet} -eq ${FLAGS_FALSE} ]; then
+      echo
+      echo "$result"
     fi
   done
   popd > /dev/null
 
   echo ""
   info "Test results:"
   ./generate_test_report "${TMP}" --strip="${TMP}/"
 
   print_time_elapsed
 }
 
 restart_in_chroot_if_needed "$@"
 main "$@"