Merge lp:~doanac/ubuntu-test-cases/system-settle-verbosity into lp:ubuntu-test-cases/smoke-touch-apps

[Andy Doan]

This reduces the verbosity of the system settle test while still retaining all the key information.

REQUIRES the merge and deployment of: https://code.launchpad.net/~doanac/utah/probes-from-host/+merge/181698

[Max Brustkern (nuclearbob)]

I find it odd that the labels include a prepended underscore rather than the log file assuming an underscore and putting the label after that, but that's not really worth changing. Seems reasonable to me.

[Andy Doan (doanac)]

On 08/23/2013 11:58 AM, Max Brustkern wrote:
> I find it odd that the labels include a prepended underscore rather than the log file assuming an underscore and putting the label after that, but that's not really worth changing. Seems reasonable to me.

I wasn't a huge fan of that. But by doing it this way, you could have a
plain "system-settle" test that didn't require a label at all

[Max Brustkern (nuclearbob)]

> On 08/23/2013 11:58 AM, Max Brustkern wrote:
> > I find it odd that the labels include a prepended underscore rather than the
> log file assuming an underscore and putting the label after that, but that's
> not really worth changing. Seems reasonable to me.
>
> I wasn't a huge fan of that. But by doing it this way, you could have a
> plain "system-settle" test that didn't require a label at all

That's a good point. Works for me.

review: Approve

=== modified file 'systemsettle/systemsettle-after/tc_control'
--- systemsettle/systemsettle-after/tc_control	2013-08-23 16:39:08 +0000
+++ systemsettle/systemsettle-after/tc_control	2013-08-23 16:39:08 +0000
@@ -6,4 +6,4 @@
   1. When doing nothing, system calms down to at least 99% idle level
 type: userland
 timeout: 120
-command: ../systemsettle.sh -c5 -d2 -p 97.5
+command: ../systemsettle.sh -c5 -d2 -p 97.5 -l _after
 
=== modified file 'systemsettle/systemsettle-before/tc_control'
--- systemsettle/systemsettle-before/tc_control	2013-08-23 16:39:08 +0000
+++ systemsettle/systemsettle-before/tc_control	2013-08-23 16:39:08 +0000
@@ -6,4 +6,4 @@
   1. When doing nothing, system calms down to at least 99% idle level
 type: userland
 timeout: 120
-command: ../systemsettle.sh -c5 -d2 -p 97.5
+command: ../systemsettle.sh -c5 -d2 -p 97.5 -l _before
 
=== modified file 'systemsettle/systemsettle.sh'
--- systemsettle/systemsettle.sh	2013-08-23 16:39:08 +0000
+++ systemsettle/systemsettle.sh	2013-08-23 16:39:08 +0000
@@ -3,29 +3,17 @@
 # Configuration variables:
 #  TARGET_PREFIX - Allows this to be run from the host, by providings something
 #                  like TARGET_PREFIX="adb shell"
+#  UTAH_PROBE_DIR - optionally where to save log files so utah will grab them
 
 set -e
 
+[ -z $UTAH_PROBE_DIR ] && UTAH_PROBE_DIR="/tmp"
+
 # default exit code storage
 dump_error=1
 
 calc () { awk "BEGIN{ print $* }" ;}
 
-cleanup () {
-  if ! test "$dump_error" = 0; then
-    echo "Check out the following top log taken at each retry:"
-
-    echo
-    # dumb toplog indented
-    while read line; do
-      echo "  $line"
-    done < $top_log
-    # dont rerun this logic in case we get multiple signals
-    dump_error=0
-  fi
-  rm -f $top_log $top_log.reduced
-}
-
 function show_usage() {
    echo "Usage:"
    echo " $0 [options]"
@@ -37,10 +25,11 @@
    echo " -i  top measurements to ignore from each loop (Default: 1)"
    echo " -m  maximum loops of top before giving up if minimum idle"
    echo "     percent is not reached (Default: 10)"
+   echo " -l  label to include for the top_log file"
    exit 129
 }
 
-while getopts "h?rp:c:d:i:m:" opt; do
+while getopts "h?rp:c:d:i:m:l:" opt; do
     case "$opt" in
         h|\?) show_usage
               ;;
@@ -56,6 +45,8 @@
               ;;
         m)    settle_max=$OPTARG
               ;;
+        l)    top_log_label=$OPTARG
+              ;;
     esac
 done
 
@@ -69,6 +60,8 @@
 # how many total attempts to settle the system
 settle_max=${settle_max:-10}
 
+top_log="$UTAH_PROBE_DIR/top$top_log_label.log"
+
 # set and calc more runtime values
 top_tail=`calc $top_repeat - $top_ignore`
 settle_count=0
@@ -83,11 +76,9 @@
 echo "  top_ignore  = '$top_ignore'"
 echo "  settle_max     = '$settle_max'"
 echo "  run_forever    = '$settle_prefix' (- = yes)"
+echo "  log files   = $top_log $top_log.reduced"
 echo
 
-trap cleanup EXIT INT QUIT ILL KILL SEGV TERM
-top_log=`mktemp -t`
-
 while test `calc $idle_avg '<' $idle_avg_min` = 1 -a "$settle_prefix$settle_count" -lt "$settle_max"; do
   echo -n "Starting system idle measurement (run: $settle_count) ... "