Various minor bootperf improvements

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
 # chroot environment.
 #
 
 # SCRIPT_DIR="$(cd "$(dirname $0)/.." ; pwd)"
 SCRIPT_DIR=$HOME/trunk/src/scripts
 . "$SCRIPT_DIR/common.sh"
 
 DEFINE_string output_dir "" "output directory for results" o
 DEFINE_boolean keep_logs "$FLAGS_FALSE" "keep autotest results" k
 
 RUN_TEST="$SCRIPT_DIR/run_remote_tests.sh"
 TEST=server/site_tests/platform_BootPerfServer/control
 TMP_RESULTS="/tmp/bootperf.$(date '+%Y%j%H%M').$$"
-RESULTS_KEYVAL=platform_BootPerfServer/platform_BootPerfServer/results/keyval
+RESULTS_DIR=platform_BootPerfServer/platform_BootPerfServer/results
+RESULTS_KEYVAL=$RESULTS_DIR/keyval
 RESULTS_SUMMARY_FILES=(
-  $RESULTS_KEYVAL
+  $RESULTS_DIR
   platform_BootPerfServer/keyval
   platform_BootPerfServer/platform_BootPerfServer/keyval
   platform_BootPerfServer/platform_BootPerfServer/platform_BootPerf/keyval
   platform_BootPerfServer/platform_BootPerfServer/status
   platform_BootPerfServer/platform_BootPerfServer/status.log
   platform_BootPerfServer/status
   platform_BootPerfServer/status.log
   platform_BootPerfServer/sysinfo/cmdline
   platform_BootPerfServer/sysinfo/cpuinfo
   platform_BootPerfServer/sysinfo/modules
@@ skipping 91 matching lines @@
 
   i=0
   while [ $i -lt $count ]; do
     local iter_rundir=$RUNDIR.$iter
     local logfile=$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)"
-    $RUN_TEST --results_dir_root="$TMP_RESULTS" \
+
+    # 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 $logfile for output from the test run,"
+      error "Check $(pwd)/$logfile for output from the test run,"
       error "and see $TMP_RESULTS for full test logs and output."
-      break
+      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
@@ skipping 49 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}"