Enhancements to bootperf, based on recent user feedback.

bootperf-bin/bootperf

 #!/bin/bash
 
 # Copyright (c) 2010 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.
 
 # Wrapper to run the platform_BootPerfServer autotest, and store the
 # results for later analysis by the 'showbootdata' script.
 #
 # NOTE: This script must be run from inside the chromeos build
@@ skipping 14 matching lines @@
       SCRIPT_ROOT=${path}
       break
     fi
   done
 }
 
 find_common_sh
 . "${SCRIPT_ROOT}/common.sh" || (echo "Unable to load common.sh" && exit 1)
 # --- END COMMON.SH BOILERPLATE ---
 
+# TODO(jrbarnette) Although run_remote_tests.sh works outside the
+# chroot, the log files it produces will be stored inside the
+# chroot.  So, from outside the chroot, this script doesn't work.
+# Yes, I think it's a bug, too.  You're welcome to fix it, if you
+# think it's so easy. :-)
+assert_inside_chroot
+
 DEFINE_string output_dir "" "output directory for results" o
 DEFINE_boolean keep_logs "$FLAGS_FALSE" "keep autotest results" k
 
 RUN_TEST="$SCRIPTS_DIR/run_remote_tests.sh"
 TEST=server/site_tests/platform_BootPerfServer/control
 TMP_RESULTS="/tmp/bootperf.$(date '+%Y%j%H%M').$$"
 RESULTS_DIR=platform_BootPerfServer/platform_BootPerfServer/results
 RESULTS_KEYVAL=$RESULTS_DIR/keyval
 RESULTS_SUMMARY_FILES=(
   $RESULTS_DIR
@@ skipping 95 matching lines @@
   local iter=$(expr "$(echo $RUNDIR.???)" : '.*\(...\)')
   if [ "$iter" != "???" ]; then
       iter=$(echo $iter | awk '{printf "%03d\n", $1 + 1}')
   else
       iter=000
   fi
 
   i=0
   while [ $i -lt $count ]; do
     local iter_rundir=$RUNDIR.$iter
-    local logfile=$iter_rundir/$RUNDIR_LOG
+    local logfile=$(pwd)/$iter_rundir/$RUNDIR_LOG
     local summary_dir=$iter_rundir/$RUNDIR_SUMMARY
     local all_results_dir=$iter_rundir/$RUNDIR_ALL_RESULTS
 
     mkdir $iter_rundir
-    echo "run $iter start at $(date)"
+    date
+    echo "  logging in $logfile"
 
     # BEWARE:  The --use_emerged option means that you must manually
     # emerge chromeos-base/autotest-tests if a) you are working on
     # the package, and b) you also want use this script to test your
     # changes to the package.  (The option is here because IMO the
     # alternative is a bigger nuisance.)
     $RUN_TEST --use_emerged --results_dir_root="$TMP_RESULTS" \
               --remote="$remote" $TEST >$logfile 2>&1
     if [ ! -e "$TMP_RESULTS/$RESULTS_KEYVAL" ]; then
       error "No results file; terminating test runs."
-      error "Check $(pwd)/$logfile for output from the test run,"
+      error "Check $logfile for output from the test run,"
       error "and see $TMP_RESULTS for full test logs and output."
       return
     fi
     mkdir $summary_dir
     tar cf - -C $TMP_RESULTS "${RESULTS_SUMMARY_FILES[@]}" |
       tar xf - -C $summary_dir
     if [ $FLAGS_keep_logs -eq $FLAGS_TRUE ]; then
       mv $TMP_RESULTS $all_results_dir
       chmod 755 $all_results_dir
     else
       rm -rf $TMP_RESULTS
     fi
     i=$(expr $i + 1)
     iter=$(echo $iter | awk '{printf "%03d\n", $1 + 1}')
   done
-  #    "run 000 start at $(date)"
-  echo "      ... end at $(date)"
+  date
   cat $RUNDIR.???/$RUNDIR_SUMMARY/$RESULTS_KEYVAL >$KEYVAL_SUMMARY
 }
 
 # Main routine - check validity of the (already parsed) command line
 # options.  'cd' to the results directory, if it was specified.  If
 # all the arguments checks pass, hand control to run_boot_test
 main() {
   if [ $# -lt 1 ]; then
       usage "Missing target host address"
   elif [ $# -gt 2 ]; then
@@ skipping 34 matching lines @@
 # for that case here.
 if ! FLAGS "$@"; then
   if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then
     exit 0
   else
     usage
   fi
 fi
 
 eval main "${FLAGS_ARGV}"