Merge lp:~percona-toolkit-dev/percona-toolkit/bash-tool-testing into lp:percona-toolkit/1.0

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-diskstats'
--- bin/pt-diskstats	2011-08-04 20:35:38 +0000
+++ bin/pt-diskstats	2011-08-19 17:39:24 +0000
@@ -284,10 +284,10 @@
 # last sample.
 group_by_disk () {
    [ -z "${awk_print_line}" ] && design_print_formats
-   cat > /tmp/percona-toolkit.awk <<EOF
+   awk "
    BEGIN {
       devs    = 0;
-      devname = "${OPT_d}";
+      devname = \"${OPT_d}\";
    }
    \$1 !~ /TS/ && \$3 ~ devname {
       ${awk_parse_line}
@@ -303,7 +303,7 @@
       }
       ${awk_find_max_device_name_length}
       ${awk_print_header}
-      elapsed = curr_ts - first["ts"];
+      elapsed = curr_ts - first[\"ts\"];
       for ( i = 1; i <= devs; i++ ) {
          dev               = devsort[i];
          ${awk_get_overall_increments}
@@ -312,21 +312,19 @@
          t_in_progress     = (tot_in_progress / (iterations - 1));
          devs_in_group     = 1;
          ${awk_compute_read_write_stats}
-         line_ts="{" (iterations - 1) "}";
+         line_ts=\"{\" (iterations - 1) \"}\";
          ${awk_print_line}
       }
-   }
-EOF
-   awk -f /tmp/percona-toolkit.awk "$@"
+   } " "$@"
 }
 
 # Prints out one line for each sample, summing up all disks together.
 group_by_sample() {
    [ -z "${awk_print_line}" ] && design_print_formats
-   cat > /tmp/percona-toolkit.awk <<EOF
+   awk "
    BEGIN {
       devs    = 0;
-      devname = "${OPT_d}";
+      devname = \"${OPT_d}\";
    }
    \$1 !~ /TS/ && \$3 ~ devname {
       ${awk_parse_line}
@@ -368,7 +366,7 @@
          devs_in_group = devs;
          ${awk_compute_read_write_stats}
          if ( devs > 1 ) {
-            dev     = "{" devs "}";
+            dev     = \"{\" devs \"}\";
          }
          else {
             dev     = devsort[1];
@@ -377,14 +375,12 @@
          printed_a_line = 1;
       }
       if ( iterations == 1 || printed_a_line == 1 ) {
-         # We don't save "curr" as "prev" on every sample we see, because if the
-         # interval of printing is more than one sample, we want "prev" to be
+         # We don't save curr as prev on every sample we see, because if the
+         # interval of printing is more than one sample, we want prev to be
          # the first sample in the interval, not the previous sample seen.
          ${awk_save_curr_as_prev}
       }
-   }
-EOF
-   awk -f /tmp/percona-toolkit.awk "$@"
+   } " "$@"
 }
 
 # Prints out one line for each sample, for each disk that matches the pattern.
 
=== modified file 'bin/pt-mysql-summary'
--- bin/pt-mysql-summary	2011-08-04 20:35:38 +0000
+++ bin/pt-mysql-summary	2011-08-19 17:39:24 +0000
@@ -202,9 +202,10 @@
 # Parses the output of 'ps -e -o args | $AP_GREP mysqld' or 'ps auxww...'
 # which should be in /tmp/percona-toolkit.
 parse_mysqld_instances () {
+   local file=$1
    echo "  Port  Data Directory             Socket"
    echo "  ===== ========================== ======"
-   $AP_GREP '/mysqld ' /tmp/percona-toolkit | while read line; do
+   $AP_GREP '/mysqld ' $file | while read line; do
       for word in ${line}; do
          # Some grep doesn't have -o, so I have to pull out the words I want by
          # looking at each word
@@ -226,12 +227,14 @@
 # /tmp/percona-toolkit.  You have to specify the port for the instance you are
 # interested in, in case there are multiple instances.
 find_my_cnf_file() {
-   if test -n "$1" && $AP_GREP -- "/mysqld.*--port=$1" /tmp/percona-toolkit >/dev/null 2>&1 ; then
-      $AP_GREP -- "/mysqld.*--port=$1" /tmp/percona-toolkit \
+   local file=$1
+   local port=$2
+   if test -n "$port" && $AP_GREP -- "/mysqld.*--port=$port" $file >/dev/null 2>&1 ; then
+      $AP_GREP -- "/mysqld.*--port=$port" $file \
          | $AP_AWK 'BEGIN{RS=" "; FS="=";} $1 ~ /--defaults-file/ { print $2; }' \
          | head -n1
    else
-      $AP_GREP '/mysqld' /tmp/percona-toolkit \
+      $AP_GREP '/mysqld' $file \
          | $AP_AWK 'BEGIN{RS=" "; FS="=";} $1 ~ /--defaults-file/ { print $2; }' \
          | head -n1
    fi
@@ -255,7 +258,8 @@
 # Gets the system start and uptime in human readable format.  Last restart date
 # should be in /tmp/percona-toolkit.
 get_mysql_uptime () {
-   restart="$(cat /tmp/percona-toolkit)"
+   local file=$1
+   restart="$(cat $file)"
    uptime="$(get_stat Uptime)"
    uptime="$(secs_to_time ${uptime})"
    echo "${restart} (up ${uptime})"
@@ -263,16 +267,18 @@
 
 # Summarizes the output of SHOW MASTER LOGS, which is in /tmp/percona-toolkit
 summarize_binlogs () {
-   name_val "Binlogs" $(wc -l /tmp/percona-toolkit)
-   name_val "Zero-Sized" $($AP_GREP -c '\<0$' /tmp/percona-toolkit)
-   size=$($AP_AWK '{t += $2} END{printf "%0.f\n", t}' /tmp/percona-toolkit)
+   local file=$1
+   name_val "Binlogs" $(wc -l $file)
+   name_val "Zero-Sized" $($AP_GREP -c '\<0$' $file)
+   size=$($AP_AWK '{t += $2} END{printf "%0.f\n", t}' $file)
    name_val "Total Size" $(shorten ${size} 1)
 }
 
 # Print out binlog_do_db and binlog_ignore_db
 format_binlog_filters () {
-   name_val "binlog_do_db" $(cut -f3 /tmp/percona-toolkit)
-   name_val "binlog_ignore_db" $(cut -f4 /tmp/percona-toolkit)
+   local file=$1
+   name_val "binlog_do_db" $(cut -f3 $file)
+   name_val "binlog_ignore_db" $(cut -f4 $file)
 }
 
 # Takes as input a file that has two samples of SHOW STATUS, columnized next to
@@ -280,9 +286,10 @@
 # absolute, all-time per second, and per-second over the interval between the
 # samples.  Omits any rows that are all zeroes.
 format_status_variables () {
+   local file=$1
    # First, figure out the intervals.
-   utime1=$($AP_AWK '/Uptime /{print $2}' /tmp/percona-toolkit);
-   utime2=$($AP_AWK '/Uptime /{print $3}' /tmp/percona-toolkit);
+   utime1=$($AP_AWK '/Uptime /{print $2}' $file);
+   utime2=$($AP_AWK '/Uptime /{print $3}' $file);
    ${AP_AWK} "
    BEGIN {
       utime1 = ${utime1};
@@ -319,12 +326,12 @@
             printf(format, \$1, perday, persec, nowsec);
          }
       }
-   }" /tmp/percona-toolkit
+   }" $file
 }
 
-# Slices the processlist a bunch of different ways.  Uses input from
-# /tmp/percona-toolkit-mysql-processlist.  The processlist should be created with the \G
-# flag so it's vertical.  The parsing is a bit awkward because different
+# Slices the processlist a bunch of different ways.  The processlist should be
+# created with the \G flag so it's vertical.
+# The parsing is a bit awkward because different
 # versions of awk have limitations like "too many fields on line xyz".  So we
 # use 'cut' to shorten the lines.  We count all things into temporary variables
 # for each process in the processlist, and when we hit the Info: line which
@@ -332,13 +339,14 @@
 # variables.  If we're summarizing Command, we count everything; otherwise, only
 # non-Sleep processes get counted towards the sum and max of Time.
 summarize_processlist () {
+   local file=$1
    for param in Command User Host db State; do
       echo
       printf '  %-30s %8s %7s %9s %9s\n' \
          "${param}" "COUNT(*)" Working "SUM(Time)" "MAX(Time)"
       echo "  ------------------------------" \
          "-------- ------- --------- ---------"
-      cut -c1-80 /tmp/percona-toolkit-mysql-processlist \
+      cut -c1-80 $file \
          | $AP_AWK "
          \$1 == \"${param}:\" {
             p = substr(\$0, index(\$0, \":\") + 2);
@@ -384,6 +392,7 @@
 # sets in regular expressions, like [[:space:]] (looking at you, Debian).  So
 # the below patterns contain [<space><tab>] and must remain that way.
 pretty_print_cnf_file () {
+   local file=$1
    $AP_AWK '
    BEGIN {
       FS="="
@@ -403,7 +412,7 @@
       else {
          print $1;
       }
-   }' /tmp/percona-toolkit
+   }' $file
 }
 
 find_checkpoint_age() {
@@ -525,37 +534,38 @@
 
 # Summarizes various things about InnoDB status that are not easy to see by eye.
 format_innodb_status () {
-   name_val "Checkpoint Age"       $(shorten $(find_checkpoint_age "${1}"))
-   name_val "InnoDB Queue"        "$(awk '/queries inside/{print}' "${1}")"
-   name_val "Oldest Transaction"  "$(find_max_trx_time "${1}") Seconds";
-   name_val "History List Len"     $(awk '/History list length/{print $4}' "$1")
-   name_val "Read Views"           $(awk '/read views open inside/{print $1}' "${1}")
-   name_val "Undo Log Entries"    "$(summarize_undo_log_entries "${1}")"
-   name_val "Pending I/O Reads"   "$(find_pending_io_reads "${1}")"
-   name_val "Pending I/O Writes"  "$(find_pending_io_writes "${1}")"
-   name_val "Pending I/O Flushes" "$(find_pending_io_flushes "${1}")"
-   $AP_AWK -F, '/^---TRANSACTION/{print $2}' "${1}" \
+   local file=$1
+   name_val "Checkpoint Age"       $(shorten $(find_checkpoint_age "${file}"))
+   name_val "InnoDB Queue"        "$(awk '/queries inside/{print}' "${file}")"
+   name_val "Oldest Transaction"  "$(find_max_trx_time "${file}") Seconds";
+   name_val "History List Len"     $(awk '/History list length/{print $4}' "${file}")
+   name_val "Read Views"           $(awk '/read views open inside/{print $1}' "${file}")
+   name_val "Undo Log Entries"    "$(summarize_undo_log_entries "${file}")"
+   name_val "Pending I/O Reads"   "$(find_pending_io_reads "${file}")"
+   name_val "Pending I/O Writes"  "$(find_pending_io_writes "${file}")"
+   name_val "Pending I/O Flushes" "$(find_pending_io_flushes "${file}")"
+   $AP_AWK -F, '/^---TRANSACTION/{print $2}' "${file}" \
       | $AP_SED -e 's/ [0-9]* sec.*//' | sort | uniq -c > /tmp/percona-toolkit2
    name_val "Transaction States" "$(group_concat /tmp/percona-toolkit2)"
-   if $AP_GREP 'TABLE LOCK table' "${1}" >/dev/null ; then
+   if $AP_GREP 'TABLE LOCK table' "${file}" >/dev/null ; then
       echo "Tables Locked"
-      $AP_AWK '/^TABLE LOCK table/{print $4}' "${1}" \
+      $AP_AWK '/^TABLE LOCK table/{print $4}' "${file}" \
          | sort | uniq -c | sort -rn
    fi
-   if $AP_GREP 'has waited at' "${1}" > /dev/null ; then
+   if $AP_GREP 'has waited at' "${file}" > /dev/null ; then
       echo "Semaphore Waits"
-      $AP_GREP 'has waited at' "${1}" | cut -d' ' -f6-8 \
+      $AP_GREP 'has waited at' "${file}" | cut -d' ' -f6-8 \
          | sort | uniq -c | sort -rn
    fi
-   if $AP_GREP 'reserved it in mode' "${1}" > /dev/null; then
+   if $AP_GREP 'reserved it in mode' "${file}" > /dev/null; then
       echo "Semaphore Holders"
       $AP_AWK '/has reserved it in mode/{
          print substr($0, 1 + index($0, "("), index($0, ")") - index($0, "(") - 1);
-      }' "${1}" | sort | uniq -c | sort -rn
+      }' "${file}" | sort | uniq -c | sort -rn
    fi
-   if $AP_GREP -e 'Mutex at' -e 'lock on' "${1}" >/dev/null 2>&1; then
+   if $AP_GREP -e 'Mutex at' -e 'lock on' "${file}" >/dev/null 2>&1; then
       echo "Mutexes/Locks Waited For"
-      $AP_GREP -e 'Mutex at' -e 'lock on' "${1}" | $AP_SED -e 's/^[XS]-//' -e 's/,.*$//' \
+      $AP_GREP -e 'Mutex at' -e 'lock on' "${file}" | $AP_SED -e 's/^[XS]-//' -e 's/,.*$//' \
          | sort | uniq -c | sort -rn
    fi
 }
@@ -564,6 +574,7 @@
 # tables, views, etc.  $1 is the file name.  $2 is the database name; if none,
 # then there should be multiple databases.
 format_overall_db_stats () {
+   local file=$1
    echo
    # We keep counts of everything in an associative array keyed by db name, and
    # what it is.  The num_dbs counter is to ensure sort order is consistent when
@@ -622,7 +633,7 @@
             printf fmt, db, counts[db ",tables"], counts[db ",views"], counts[db ",sps"], counts[db ",trg"], counts[db ",func"], counts[db ",fk"], counts[db ",partn"];
          }
       }
-   ' /tmp/percona-toolkit-mysqldump > /tmp/percona-toolkit
+   ' $file > /tmp/percona-toolkit
    head -n2 /tmp/percona-toolkit
    tail -n +3 /tmp/percona-toolkit | sort
 
@@ -682,7 +693,7 @@
             print "";
          }
       }
-   ' /tmp/percona-toolkit-mysqldump > /tmp/percona-toolkit
+   ' $file > /tmp/percona-toolkit
    head -n1 /tmp/percona-toolkit
    tail -n +2 /tmp/percona-toolkit | sort
 
@@ -755,7 +766,7 @@
             print "";
          }
       }
-   ' /tmp/percona-toolkit-mysqldump > /tmp/percona-toolkit
+   ' $file > /tmp/percona-toolkit
    head -n1 /tmp/percona-toolkit
    tail -n +2 /tmp/percona-toolkit | sort
 
@@ -846,12 +857,11 @@
             print "";
          }
       }
-   ' /tmp/percona-toolkit-mysqldump > /tmp/percona-toolkit
+   ' $file > /tmp/percona-toolkit
    hdr=$($AP_GREP -n Database /tmp/percona-toolkit | cut -d: -f1);
    head -n${hdr} /tmp/percona-toolkit
    tail -n +$((${hdr} + 1)) /tmp/percona-toolkit | sort
    echo
-
 }
 
 # ##############################################################################
@@ -878,7 +888,7 @@
    name_val "System time" "`date -u +'%F %T UTC'` (local TZ: `date +'%Z %z'`)"
    section Instances
    ps auxww 2>/dev/null | $AP_GREP mysqld > /tmp/percona-toolkit
-   parse_mysqld_instances
+   parse_mysqld_instances /tmp/percona-toolkit
 
    # ########################################################################
    # Fetch some basic info so we can start
@@ -890,13 +900,13 @@
       exit 1
    fi
    user="$(cat /tmp/percona-toolkit)";
-   mysql -ss -e 'SHOW /*!40100 GLOBAL*/ VARIABLES' "$@" > /tmp/percona-toolkit-mysql-variables
-   mysql -ss -e 'SHOW /*!50000 GLOBAL*/ STATUS' "$@" > /tmp/percona-toolkit-mysql-status
-   mysql -ss -e 'SHOW DATABASES' "$@" > /tmp/percona-toolkit-mysql-databases 2>/dev/null
-   mysql -ssE -e 'SHOW SLAVE STATUS' "$@" > /tmp/percona-toolkit-mysql-slave 2>/dev/null
-   mysql -ssE -e 'SHOW /*!50000 ENGINE*/ INNODB STATUS' "$@" > /tmp/percona-toolkit-innodb-status 2>/dev/null
-   mysql -ssE -e 'SHOW FULL PROCESSLIST' "$@" > /tmp/percona-toolkit-mysql-processlist 2>/dev/null
-   now="$(mysql -ss -e 'SELECT NOW()' "$@")"
+   mysql "$@" -ss  -e 'SHOW /*!40100 GLOBAL*/ VARIABLES' > /tmp/percona-toolkit-mysql-variables
+   mysql "$@" -ss  -e 'SHOW /*!50000 GLOBAL*/ STATUS' > /tmp/percona-toolkit-mysql-status
+   mysql "$@" -ss  -e 'SHOW DATABASES' > /tmp/percona-toolkit-mysql-databases 2>/dev/null
+   mysql "$@" -ssE -e 'SHOW SLAVE STATUS' > /tmp/percona-toolkit-mysql-slave 2>/dev/null
+   mysql "$@" -ssE -e 'SHOW /*!50000 ENGINE*/ INNODB STATUS' > /tmp/percona-toolkit-innodb-status 2>/dev/null
+   mysql "$@" -ssE -e 'SHOW FULL PROCESSLIST' > /tmp/percona-toolkit-mysql-processlist 2>/dev/null
+   now="$(mysql "$@" -ss -e 'SELECT NOW()')"
    port="$(get_var port)"
 
    # ########################################################################
@@ -909,9 +919,9 @@
    get_mysql_version
 
    uptime="$(get_stat Uptime)"
-   mysql -ss -e "SELECT LEFT(NOW() - INTERVAL ${uptime} SECOND, 16)" "$@" \
+   mysql "$@" -ss -e "SELECT LEFT(NOW() - INTERVAL ${uptime} SECOND, 16)" \
       > /tmp/percona-toolkit
-   name_val Started "$(get_mysql_uptime)"
+   name_val Started "$(get_mysql_uptime /tmp/percona-toolkit)"
 
    name_val Databases "$($AP_GREP -c . /tmp/percona-toolkit-mysql-databases)"
    name_val Datadir "$(get_var datadir)"
@@ -932,7 +942,7 @@
    # Processlist, sliced several different ways
    # ########################################################################
    section Processlist
-   summarize_processlist
+   summarize_processlist /tmp/percona-toolkit-mysql-processlist
 
    # ########################################################################
    # Queries and query plans
@@ -940,7 +950,7 @@
    section "Status_Counters_(Wait_10_Seconds)"
    sleep 10
    # TODO: gather this data in the same format as normal: stats, TS line
-   mysql -ss -e 'SHOW /*!50000 GLOBAL*/ STATUS' "$@" \
+   mysql "$@" -ss -e 'SHOW /*!50000 GLOBAL*/ STATUS' \
       | join /tmp/percona-toolkit-mysql-status - > /tmp/percona-toolkit 
    # Make a file with a list of things we want to omit because they aren't
    # counters, they are gauges (in RRDTool terminology).  Gauges are shown
@@ -967,7 +977,7 @@
    do
       echo "${var}" >> /tmp/percona-toolkit-noncounters
    done
-   format_status_variables | $AP_GREP -v -f /tmp/percona-toolkit-noncounters
+   format_status_variables /tmp/percona-toolkit | $AP_GREP -v -f /tmp/percona-toolkit-noncounters
 
    # ########################################################################
    # Table cache
@@ -1035,7 +1045,7 @@
          # that option to mysqldump, because when mysqldump checks for them, it
          # can take a long time, one table at a time.
          triggers="--skip-triggers"
-         trg=$(mysql -ss -e "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TRIGGERS" 2>/dev/null);
+         trg=$(mysql "$@" -ss -e "SELECT COUNT(*) FROM INFORMATION_SCHEMA.TRIGGERS" 2>/dev/null);
          if [ "${res}" ]; then
             if [ "${res}" -gt 0 ]; then
                triggers="--triggers"
@@ -1048,15 +1058,15 @@
       echo "There are ${num_dbs} databases.  Would you like to dump all, or just one?"
       echo -n "Type the name of the database, or press Enter to dump all of them. "
       read dbtodump
-      mysqldump --no-data --skip-comments \
+      mysqldump "$@" --no-data --skip-comments \
          --skip-add-locks --skip-add-drop-table --compact \
          --skip-lock-all-tables --skip-lock-tables --skip-set-charset \
-         ${trg_arg} "$@" ${dbtodump:---all-databases} > /tmp/percona-toolkit-mysqldump
+         ${trg_arg} ${dbtodump:---all-databases} > /tmp/percona-toolkit-mysqldump
       # Test the result by checking the file, not by the exit status, because we
       # might get partway through and then die, and the info is worth analyzing
       # anyway.
       if $AP_GREP 'CREATE TABLE' /tmp/percona-toolkit-mysqldump >/dev/null 2>&1; then
-         format_overall_db_stats
+         format_overall_db_stats /tmp/percona-toolkit-mysqldump
       else
          echo "Skipping schema analysis due to apparent error in dump file"
          rm -f /tmp/percona-toolkit-mysqldump
@@ -1189,8 +1199,8 @@
    # Users & Security
    # ########################################################################
    section Security
-   users="$(mysql -ss \
-      -e 'SELECT COUNT(*), SUM(user=""), SUM(password=""), SUM(password NOT LIKE "*%") FROM mysql.user' "$@" 2>/dev/null \
+   users="$(mysql "$@" -ss \
+      -e 'SELECT COUNT(*), SUM(user=""), SUM(password=""), SUM(password NOT LIKE "*%") FROM mysql.user' 2>/dev/null \
       | $AP_AWK '{printf "%d users, %d anon, %d w/o pw, %d old pw\n", $1, $2, $3, $4}')"
    name_val Users "${users}"
    name_val "Old Passwords" $(get_var old_passwords)
@@ -1201,15 +1211,15 @@
    section Binary_Logging
    binlog=$(get_var log_bin)
    if [ "${binlog}" ]; then
-      mysql -ss -e 'SHOW MASTER LOGS' "$@" > /tmp/percona-toolkit 2>/dev/null
-      summarize_binlogs
+      mysql "$@" -ss -e 'SHOW MASTER LOGS' > /tmp/percona-toolkit 2>/dev/null
+      summarize_binlogs /tmp/percona-toolkit
       format="$(get_var binlog_format)"
       name_val binlog_format "${format:-STATEMENT}"
       name_val expire_logs_days $(get_var expire_logs_days)
       name_val sync_binlog $(get_var sync_binlog)
       name_val server_id $(get_var server_id)
-      mysql -ss -e 'SHOW MASTER STATUS' "$@" > /tmp/percona-toolkit 2>/dev/null
-      format_binlog_filters
+      mysql "$@" -ss -e 'SHOW MASTER STATUS' > /tmp/percona-toolkit 2>/dev/null
+      format_binlog_filters /tmp/percona-toolkit
    fi
 
 # Replication: seconds behind, running, filters, skip_slave_start, skip_errors,
@@ -1243,7 +1253,7 @@
    # ########################################################################
    section Configuration_File
    ps auxww 2>/dev/null | $AP_GREP mysqld > /tmp/percona-toolkit
-   cnf_file=$(find_my_cnf_file ${port});
+   cnf_file=$(find_my_cnf_file /tmp/percona-toolkit ${port});
    if [ ! -e "${cnf_file}" ]; then
       name_val "Config File" "Cannot autodetect, trying common locations"
       cnf_file="/etc/my.cnf";
@@ -1257,7 +1267,7 @@
    if [ -e "${cnf_file}" ]; then
       name_val "Config File" "${cnf_file}"
       cat "${cnf_file}" > /tmp/percona-toolkit
-      pretty_print_cnf_file
+      pretty_print_cnf_file /tmp/percona-toolkit
    else
       name_val "Config File" "Cannot autodetect or find, giving up"
    fi
 
=== modified file 'bin/pt-pmp'
--- bin/pt-pmp	2011-08-04 20:35:38 +0000
+++ bin/pt-pmp	2011-08-19 17:39:24 +0000
@@ -17,16 +17,17 @@
 # to aggregate, and the files to read.  If maxlen=0, it means infinity.  We have
 # to pass the maxlen argument into this function to make maxlen testable.
 aggregate_stacktrace() {
-   maxlen="$1";
-   cat > /tmp/percona-toolkit.awk <<EOF
+   local maxlen=$1;
+   shift
+   awk "
       BEGIN {
-         s = "";
+         s = \"\";
       }
       /^Thread/ {
-         if ( s != "" ) {
+         if ( s != \"\" ) {
             print s;
          }
-         s = "";
+         s = \"\";
          c = 0;
       }
       /^\#/ {
@@ -38,37 +39,37 @@
                targ = \$4;
             }
             if ( targ ~ /[<\\(]/ ) {
-               targ = substr(\$0, index(\$0, " in ") + 4);
+               targ = substr(\$0, index(\$0, \" in \") + 4);
                if ( targ ~ / from / ) {
-                  targ = substr(targ, 1, index(targ, " from ") - 1);
+                  targ = substr(targ, 1, index(targ, \" from \") - 1);
                }
                if ( targ ~ / at / ) {
-                  targ = substr(targ, 1, index(targ, " at ") - 1);
+                  targ = substr(targ, 1, index(targ, \" at \") - 1);
                }
                # Shorten C++ templates, e.g. in t/samples/stacktrace-004.txt
                while ( targ ~ />::/ ) {
-                  if ( 0 == gsub(/<[^<>]*>/, "", targ) ) {
+                  if ( 0 == gsub(/<[^<>]*>/, \"\", targ) ) {
                      break;
                   }
                }
                # Further shorten argument lists.
                while ( targ ~ /\\(/ ) {
-                  if ( 0 == gsub(/\\([^()]*\\)/, "", targ) ) {
+                  if ( 0 == gsub(/\\([^()]*\\)/, \"\", targ) ) {
                      break;
                   }
                }
                # Remove void and const decorators.
-               gsub(/ ?(void|const) ?/, "", targ);
-               gsub(/ /, "", targ);
+               gsub(/ ?(void|const) ?/, \"\", targ);
+               gsub(/ /, \"\", targ);
             }
             else if ( targ ~ /\\?\\?/ && \$2 ~ /[1-9]/ ) {
                # Substitute ?? by the name of the library.
                targ = \$NF;
                while ( targ ~ /\\// ) {
-                  targ = substr(targ, index(targ, "/") + 1);
+                  targ = substr(targ, index(targ, \"/\") + 1);
                }
-               targ = substr(targ, 1, index(targ, ".") - 1);
-               targ = targ "::??";
+               targ = substr(targ, 1, index(targ, \".\") - 1);
+               targ = targ \"::??\";
             }
          }
          else {
@@ -76,14 +77,14 @@
          }
          # get rid of long symbol names such as 'pthread_cond_wait@@GLIBC_2.3.2'
          if ( targ ~ /@@/ ) {
-            fname = substr(targ, 1, index(targ, "@@") - 1);
+            fname = substr(targ, 1, index(targ, \"@@\") - 1);
          }
          else {
             fname = targ;
          }
          if ( ${maxlen:-0} == 0 || c < ${maxlen:-0} ) {
-            if (s != "" ) {
-               s = s "," fname;
+            if (s != \"\" ) {
+               s = s \",\" fname;
             }
             else {
                s = fname;
@@ -94,9 +95,7 @@
       END {
          print s
       }
-EOF
-   awk -f /tmp/percona-toolkit.awk "$2" | sort | uniq -c | sort -r -n -k 1,1
-   rm -f /tmp/percona-toolkit
+   " "$@" | sort | uniq -c | sort -r -n -k 1,1
 }
 
 # The main program to run.
 
=== modified file 'bin/pt-summary'
--- bin/pt-summary	2011-08-04 20:35:38 +0000
+++ bin/pt-summary	2011-08-19 17:39:24 +0000
@@ -136,13 +136,14 @@
 # Parse Linux's /proc/cpuinfo, which should be stored in /tmp/percona-toolkit.
 # ##############################################################################
 parse_proc_cpuinfo () {
+   local file=$1
    # Physical processors are indicated by distinct 'physical id'.  Virtual CPUs
    # are indicated by paragraphs -- one per paragraph.  We assume that all
    # processors are identical, i.e. that there are not some processors with dual
    # cores and some with quad cores.
-   virtual=$(grep -c ^processor /tmp/percona-toolkit);
-   physical=$(grep 'physical id' /tmp/percona-toolkit | sort -u | wc -l);
-   cores=$(grep 'cpu cores' /tmp/percona-toolkit | head -n 1 | cut -d: -f2);
+   virtual=$(grep -c ^processor $file);
+   physical=$(grep 'physical id' $file | sort -u | wc -l);
+   cores=$(grep 'cpu cores' $file | head -n 1 | cut -d: -f2);
 
    # Older kernel won't have 'physical id' or 'cpu cores'.
    if [ "${physical}" = "0" ]; then physical=${virtual}; fi
@@ -155,17 +156,17 @@
 
    name_val "Processors" "physical = ${physical}, cores = ${cores}, virtual = ${virtual}, hyperthreading = ${htt}"
 
-   awk -F: '/cpu MHz/{print $2}' /tmp/percona-toolkit \
-      | sort | uniq -c > /tmp/percona-toolkit2
-   name_val "Speeds" "$(group_concat /tmp/percona-toolkit2)"
-
-   awk -F: '/model name/{print $2}' /tmp/percona-toolkit \
-      | sort | uniq -c > /tmp/percona-toolkit2
-   name_val "Models" "$(group_concat /tmp/percona-toolkit2)"
-
-   awk -F: '/cache size/{print $2}' /tmp/percona-toolkit \
-      | sort | uniq -c > /tmp/percona-toolkit2
-   name_val "Caches" "$(group_concat /tmp/percona-toolkit2)"
+   awk -F: '/cpu MHz/{print $2}' $file \
+      | sort | uniq -c > "$file.unq"
+   name_val "Speeds" "$(group_concat "$file.unq")"
+
+   awk -F: '/model name/{print $2}' $file \
+      | sort | uniq -c > "$file.unq"
+   name_val "Models" "$(group_concat "$file.unq")"
+
+   awk -F: '/cache size/{print $2}' $file \
+      | sort | uniq -c > "$file.unq"
+   name_val "Caches" "$(group_concat "$file.unq")"
 }
 
 # ##############################################################################
@@ -196,16 +197,18 @@
 # Parse the output of 'free -b' plus the contents of /proc/meminfo
 # ##############################################################################
 parse_free_minus_b () {
-   physical=$(awk '/Mem:/{print $3}' "${1}")
-   swap=$(awk '/Swap:/{print $3}' "${1}")
-   virtual=$(shorten $(($physical + $swap)))
-
-   name_val Total   $(shorten $(awk '/Mem:/{print $2}' "${1}"))
-   name_val Free    $(shorten $(awk '/Mem:/{print $4}' "${1}"))
+   local file=$1
+
+   local physical=$(awk '/Mem:/{print $3}' "${file}")
+   local swap=$(awk '/Swap:/{print $3}' "${file}")
+   local virtual=$(shorten $(($physical + $swap)))
+
+   name_val Total   $(shorten $(awk '/Mem:/{print $2}' "${file}"))
+   name_val Free    $(shorten $(awk '/Mem:/{print $4}' "${file}"))
    name_val Used    "physical = $(shorten ${physical}), swap = $(shorten ${swap}), virtual = ${virtual}"
-   name_val Buffers $(shorten $(awk '/Mem:/{print $6}' "${1}"))
-   name_val Caches  $(shorten $(awk '/Mem:/{print $7}' "${1}"))
-   name_val Dirty  "$(awk '/Dirty:/ {print $2, $3}' "${1}")"
+   name_val Buffers $(shorten $(awk '/Mem:/{print $6}' "${file}"))
+   name_val Caches  $(shorten $(awk '/Mem:/{print $7}' "${file}"))
+   name_val Dirty  "$(awk '/Dirty:/ {print $2, $3}' "${file}")"
 }
 
 # ##############################################################################
@@ -233,10 +236,10 @@
 }
 
 # ##############################################################################
-# Parse memory devices from the output of 'dmidecode', which should be stored in
-# /tmp/percona-toolkit.
+# Parse memory devices from the output of 'dmidecode'.
 # ##############################################################################
 parse_dmidecode_mem_devices () {
+   local file=$1
    echo "  Locator   Size     Speed             Form Factor   Type          Type Detail"
    echo "  ========= ======== ================= ============= ============= ==========="
    # Print paragraphs containing 'Memory Device\n', extract the desired bits,
@@ -254,7 +257,7 @@
           -e 's/</{/g' \
           -e 's/>/}/g' \
           -e 's/[ \t]*\n/\n/g' \
-       /tmp/percona-toolkit \
+       $file \
        | awk -F: '/Size|Type|Form.Factor|Type.Detail|[^ ]Locator/{printf("|%s", $2)}/Speed/{print "|" $2}' \
        | sed -e 's/No Module Installed/{EMPTY}/' \
        | sort \
@@ -292,10 +295,11 @@
 # Parse the output of 'netstat -antp' which should be in /tmp/percona-toolkit.
 # ##############################################################################
 parse_netstat () {
+   local file=$1
    echo "  Connections from remote IP addresses"
    awk '$1 ~ /^tcp/ && $5 ~ /^[1-9]/ {
       print substr($5, 0, index($5, ":") - 1);
-   }' /tmp/percona-toolkit | sort | uniq -c \
+   }' $file | sort | uniq -c \
       | awk "{
          fuzzy_var=\$1;
          ${fuzzy_formula}
@@ -305,7 +309,7 @@
    echo "  Connections to local IP addresses"
    awk '$1 ~ /^tcp/ && $5 ~ /^[1-9]/ {
       print substr($4, 0, index($4, ":") - 1);
-   }' /tmp/percona-toolkit | sort | uniq -c \
+   }' $file | sort | uniq -c \
       | awk "{
          fuzzy_var=\$1;
          ${fuzzy_formula}
@@ -315,7 +319,7 @@
    echo "  Connections to top 10 local ports"
    awk '$1 ~ /^tcp/ && $5 ~ /^[1-9]/ {
       print substr($4, index($4, ":") + 1);
-   }' /tmp/percona-toolkit | sort | uniq -c | sort -rn | head -n10 \
+   }' $file | sort | uniq -c | sort -rn | head -n10 \
       | awk "{
          fuzzy_var=\$1;
          ${fuzzy_formula}
@@ -324,7 +328,7 @@
    echo "  States of connections"
    awk '$1 ~ /^tcp/ {
       print $6;
-   }' /tmp/percona-toolkit | sort | uniq -c | sort -rn \
+   }' $file | sort | uniq -c | sort -rn \
       | awk "{
          fuzzy_var=\$1;
          ${fuzzy_formula}
@@ -341,7 +345,10 @@
    # requires two passes through the file.  The first pass finds the max size of
    # these columns and prints out a printf spec, and the second prints out the
    # file nicely aligned.
-   cat > /tmp/pt-summary.awk <<-EOF
+   local file=$1
+   local platform=$2
+
+   local spec=$(awk "
       BEGIN {
          device     = 10;
          fstype     = 4;
@@ -351,9 +358,9 @@
          f_device     = \$1;
          f_fstype     = \$10;
          f_options    = substr(\$11, 2, length(\$11) - 2);
-         if ( "$2" == "FreeBSD" ) {
+         if ( \"$2\" == \"FreeBSD\" ) {
             f_fstype  = substr(\$9, 2, length(\$9) - 2);
-            f_options = substr(\$0, index(\$0, ",") + 2);
+            f_options = substr(\$0, index(\$0, \",\") + 2);
             f_options = substr(f_options, 1, length(f_options) - 1);
          }
          if ( length(f_device) > device ) {
@@ -367,30 +374,26 @@
          }
       }
       END{
-         print "%-" device "s %5s %4s %-" fstype "s %-" options "s %s";
+         print \"%-\" device \"s %5s %4s %-\" fstype \"s %-\" options \"s %s\";
       }
-	EOF
-   spec="$( awk -f /tmp/pt-summary.awk "$1" )";
-   #awk -f /tmp/pt-summary.awk "$1"
-   #return;
+   " $file)
 
-   cat > /tmp/pt-summary.awk <<-EOF
+   awk "
       BEGIN {
-         spec="  ${spec}\\n";
-         printf spec, "Filesystem", "Size", "Used", "Type", "Opts", "Mountpoint";
+         spec=\"  ${spec}\\n\";
+         printf spec, \"Filesystem\", \"Size\", \"Used\", \"Type\", \"Opts\", \"Mountpoint\";
       }
       {
          f_fstype     = \$10;
          f_options    = substr(\$11, 2, length(\$11) - 2);
-         if ( "$2" == "FreeBSD" ) {
+         if ( \"$2\" == \"FreeBSD\" ) {
             f_fstype  = substr(\$9, 2, length(\$9) - 2);
-            f_options = substr(\$0, index(\$0, ",") + 2);
+            f_options = substr(\$0, index(\$0, \",\") + 2);
             f_options = substr(f_options, 1, length(f_options) - 1);
          }
          printf spec, \$1, \$2, \$5, f_fstype, f_options, \$6;
       }
-	EOF
-   awk -f /tmp/pt-summary.awk "$1"
+   " $file
 }
 
 # ##############################################################################
@@ -398,6 +401,7 @@
 # multiple fdisk -l outputs in the file.
 # ##############################################################################
 parse_fdisk () {
+   local file=$1
    awk '
       BEGIN {
          format="%-12s %4s %10s %10s %18s\n";
@@ -423,7 +427,7 @@
          }
          printf(format, $1, "Part", start, end, sprintf("%.0f", (end - start) * units));
       }
-   ' /tmp/percona-toolkit
+   ' $file
 }
 
 # ##############################################################################
@@ -431,17 +435,18 @@
 # virtualization.
 # ##############################################################################
 parse_virtualization_dmesg () {
-   if grep -qi -e vmware -e vmxnet -e 'paravirtualized kernel on vmi' /tmp/percona-toolkit; then
+   local file=$1
+   if grep -qi -e vmware -e vmxnet -e 'paravirtualized kernel on vmi' $file; then
       echo "VMWare";
-   elif grep -qi -e 'paravirtualized kernel on xen' -e 'Xen virtual console' /tmp/percona-toolkit; then
+   elif grep -qi -e 'paravirtualized kernel on xen' -e 'Xen virtual console' $file; then
       echo "Xen";
-   elif grep -qi qemu /tmp/percona-toolkit; then
+   elif grep -qi qemu $file; then
       echo "QEmu";
-   elif grep -qi 'paravirtualized kernel on KVM' /tmp/percona-toolkit; then
+   elif grep -qi 'paravirtualized kernel on KVM' $file; then
       echo "KVM";
-   elif grep -q VBOX /tmp/percona-toolkit; then
+   elif grep -q VBOX $file; then
       echo "VirtualBox";
-   elif grep -qi 'hd.: Virtual .., ATA.*drive' /tmp/percona-toolkit; then
+   elif grep -qi 'hd.: Virtual .., ATA.*drive' $file; then
       echo "Microsoft VirtualPC";
    fi
 }
@@ -462,7 +467,8 @@
 # Ethernet cards.
 # ##############################################################################
 parse_ethernet_controller_lspci () {
-   grep -i ethernet /tmp/percona-toolkit | cut -d: -f3 | while read line; do
+   local file=$1
+   grep -i ethernet $file | cut -d: -f3 | while read line; do
       name_val Controller "${line}"
    done
 }
@@ -472,20 +478,21 @@
 # controllers.
 # ##############################################################################
 parse_raid_controller_lspci () {
-   if grep -q "RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS" /tmp/percona-toolkit; then
+   local file=$1
+   if grep -q "RAID bus controller: LSI Logic / Symbios Logic MegaRAID SAS" $file; then
       echo 'LSI Logic MegaRAID SAS'
-   elif grep -q "Fusion-MPT SAS" /tmp/percona-toolkit; then
+   elif grep -q "Fusion-MPT SAS" $file; then
       echo 'Fusion-MPT SAS'
-   elif grep -q "RAID bus controller: LSI Logic / Symbios Logic Unknown" /tmp/percona-toolkit; then
+   elif grep -q "RAID bus controller: LSI Logic / Symbios Logic Unknown" $file; then
       echo 'LSI Logic Unknown'
-   elif grep -q "RAID bus controller: Adaptec AAC-RAID" /tmp/percona-toolkit; then
+   elif grep -q "RAID bus controller: Adaptec AAC-RAID" $file; then
       echo 'AACRAID'
-   elif grep -q "3ware [0-9]* Storage Controller" /tmp/percona-toolkit; then
+   elif grep -q "3ware [0-9]* Storage Controller" $file; then
       echo '3Ware'
-   elif grep -q "Hewlett-Packard Company Smart Array" /tmp/percona-toolkit; then
+   elif grep -q "Hewlett-Packard Company Smart Array" $file; then
       echo 'HP Smart Array'
-   elif grep -q " RAID bus controller: " /tmp/percona-toolkit; then
-      awk -F: '/RAID bus controller\:/ {print $3" "$5" "$6}' /tmp/percona-toolkit
+   elif grep -q " RAID bus controller: " $file; then
+      awk -F: '/RAID bus controller\:/ {print $3" "$5" "$6}' $file
    fi
 }
 
@@ -494,14 +501,15 @@
 # controllers.
 # ##############################################################################
 parse_raid_controller_dmesg () {
+   local file=$1
    pat='scsi[0-9].*: .*'
-   if grep -qi "${pat}megaraid" /tmp/percona-toolkit; then
+   if grep -qi "${pat}megaraid" $file; then
       echo 'LSI Logic MegaRAID SAS'
-   elif grep -q "Fusion MPT SAS" /tmp/percona-toolkit; then
+   elif grep -q "Fusion MPT SAS" $file; then
       echo 'Fusion-MPT SAS'
-   elif grep -q "${pat}aacraid" /tmp/percona-toolkit; then
+   elif grep -q "${pat}aacraid" $file; then
       echo 'AACRAID'
-   elif grep -q "${pat}3ware [0-9]* Storage Controller" /tmp/percona-toolkit; then
+   elif grep -q "${pat}3ware [0-9]* Storage Controller" $file; then
       echo '3Ware'
    fi
 }
@@ -511,20 +519,22 @@
 # /tmp/percona-toolkit
 # ##############################################################################
 parse_hpacucli () {
-   grep 'logicaldrive\|physicaldrive' /tmp/percona-toolkit
+   local file=$1
+   grep 'logicaldrive\|physicaldrive' $file
 }
 
 # ##############################################################################
 # Parse the output of arcconf, which should be stored in /tmp/percona-toolkit
 # ##############################################################################
 parse_arcconf () {
-   model=$(awk -F: '/Controller Model/{print $2}' /tmp/percona-toolkit)
-   chan="$(awk -F: '/Channel description/{print $2}' /tmp/percona-toolkit)"
-   cache="$(awk -F: '/Installed memory/{print $2}' /tmp/percona-toolkit)"
-   status="$(awk -F: '/Controller Status/{print $2}' /tmp/percona-toolkit)"
+   local file=$1
+   model=$(awk -F: '/Controller Model/{print $2}' $file)
+   chan="$(awk -F: '/Channel description/{print $2}' $file)"
+   cache="$(awk -F: '/Installed memory/{print $2}' $file)"
+   status="$(awk -F: '/Controller Status/{print $2}' $file)"
    name_val Specs "${model/ /},${chan},${cache} cache,${status}"
 
-   battery=$(grep -A5 'Controller Battery Info' /tmp/percona-toolkit \
+   battery=$(grep -A5 'Controller Battery Info' $file \
       | awk '/Capacity remaining/ {c=$4}
              /Status/             {s=$3}
              /Time remaining/     {t=sprintf("%dd%dh%dm", $7, $9, $11)}
@@ -537,9 +547,8 @@
    echo
    echo "  LogicalDev Size      RAID Disks Stripe Status  Cache"
    echo "  ========== ========= ==== ===== ====== ======= ======="
-   for dev in $(awk '/Logical device number/{print $4}' /tmp/percona-toolkit); do
-      sed -n -e "/^Logical device .* ${dev}$/,/^$\|^Logical device number/p" \
-         /tmp/percona-toolkit \
+   for dev in $(awk '/Logical device number/{print $4}' $file); do
+      sed -n -e "/^Logical device .* ${dev}$/,/^$\|^Logical device number/p" $file \
       | awk '
          /Logical device name/               {d=$5}
          /Size/                              {z=$3 " " $4}
@@ -565,7 +574,7 @@
 
    # Find the paragraph with physical devices, tabularize with assoc arrays.
    tempresult=""
-   sed -n -e '/Physical Device information/,/^$/p' /tmp/percona-toolkit \
+   sed -n -e '/Physical Device information/,/^$/p' $file \
       | awk -F: '
          /Device #[0-9]/ {
             device=substr($0, index($0, "#"));
@@ -612,32 +621,33 @@
                }
             }
          }'
-
 }
 
 # ##############################################################################
-# Parse the output of "lsiutil -i -s" from /tmp/percona-toolkit
+# Parse the output of "lsiutil -i -s".
 # ##############################################################################
 parse_fusionmpt_lsiutil () {
+   local file=$1
    echo
-   awk '/LSI.*Firmware/ { print " ", $0 }' /tmp/percona-toolkit
-   grep . /tmp/percona-toolkit | sed -n -e '/B___T___L/,$ {s/^/  /; p}'
+   awk '/LSI.*Firmware/ { print " ", $0 }' $file
+   grep . $file | sed -n -e '/B___T___L/,$ {s/^/  /; p}'
 }
 
 # ##############################################################################
 # Parse the output of MegaCli64 -AdpAllInfo -aALL from /tmp/percona-toolkit.
 # ##############################################################################
 parse_lsi_megaraid_adapter_info () {
-   name=$(awk -F: '/Product Name/{print substr($2, 2)}' /tmp/percona-toolkit);
-   int=$(awk '/Host Interface/{print $4}' /tmp/percona-toolkit);
-   prt=$(awk '/Number of Backend Port/{print $5}' /tmp/percona-toolkit);
-   bbu=$(awk '/^BBU             :/{print $3}' /tmp/percona-toolkit);
-   mem=$(awk '/Memory Size/{print $4}' /tmp/percona-toolkit);
-   vdr=$(awk '/Virtual Drives/{print $4}' /tmp/percona-toolkit);
-   dvd=$(awk '/Degraded/{print $3}' /tmp/percona-toolkit);
-   phy=$(awk '/^  Disks/{print $3}' /tmp/percona-toolkit);
-   crd=$(awk '/Critical Disks/{print $4}' /tmp/percona-toolkit);
-   fad=$(awk '/Failed Disks/{print $4}' /tmp/percona-toolkit);
+   local file=$1
+   name=$(awk -F: '/Product Name/{print substr($2, 2)}' $file);
+   int=$(awk '/Host Interface/{print $4}' $file);
+   prt=$(awk '/Number of Backend Port/{print $5}' $file);
+   bbu=$(awk '/^BBU             :/{print $3}' $file);
+   mem=$(awk '/Memory Size/{print $4}' $file);
+   vdr=$(awk '/Virtual Drives/{print $4}' $file);
+   dvd=$(awk '/Degraded/{print $3}' $file);
+   phy=$(awk '/^  Disks/{print $3}' $file);
+   crd=$(awk '/Critical Disks/{print $4}' $file);
+   fad=$(awk '/Failed Disks/{print $4}' $file);
    name_val Model "${name}, ${int} interface, ${prt} ports"
    name_val Cache "${mem} Memory, BBU ${bbu}"
 }
@@ -647,9 +657,10 @@
 # /opt/MegaRAID/MegaCli/MegaCli64 -AdpBbuCmd -GetBbuStatus -aALL
 # ##############################################################################
 parse_lsi_megaraid_bbu_status () {
-   charge=$(awk '/Relative State/{print $5}' /tmp/percona-toolkit);
-   temp=$(awk '/^Temperature/{print $2}' /tmp/percona-toolkit);
-   soh=$(awk '/isSOHGood:/{print $2}' /tmp/percona-toolkit);
+   local file=$1
+   charge=$(awk '/Relative State/{print $5}' $file);
+   temp=$(awk '/^Temperature/{print $2}' $file);
+   soh=$(awk '/isSOHGood:/{print $2}' $file);
    name_val BBU "${charge}% Charged, Temperature ${temp}C, isSOHGood=${soh}"
 }
 
@@ -660,11 +671,12 @@
 # /opt/MegaRAID/MegaCli/MegaCli64 -PDList -aALL
 # ##############################################################################
 parse_lsi_megaraid_devices () {
+   local file=$1
    echo
    echo "  PhysiclDev Type State   Errors Vendor  Model        Size"
    echo "  ========== ==== ======= ====== ======= ============ ==========="
-   for dev in $(awk '/Device Id/{print $3}' /tmp/percona-toolkit); do
-      sed -e '/./{H;$!d;}' -e "x;/Device Id: ${dev}/!d;" /tmp/percona-toolkit \
+   for dev in $(awk '/Device Id/{print $3}' $file); do
+      sed -e '/./{H;$!d;}' -e "x;/Device Id: ${dev}/!d;" $file \
       | awk '
          /Media Type/                        {d=substr($0, index($0, ":") + 2)}
          /PD Type/                           {t=$3}
@@ -688,6 +700,7 @@
 # /opt/MegaRAID/MegaCli/MegaCli64 -LDInfo -Lall -aAll
 # ##############################################################################
 parse_lsi_megaraid_virtual_devices () {
+   local file=$1
    # Somewhere on the Internet, I found the following guide to understanding the
    # RAID level, but I don't know the source anymore.
    #    Primary-0, Secondary-0, RAID Level Qualifier-0 = 0
@@ -758,7 +771,7 @@
                devices[device ",stripe"], devices[device ",state"],
                devices[device ",wpolicy"] ", " devices[device ",rpolicy"]);
          }
-      }' /tmp/percona-toolkit
+      }' $file
 }
 
 # ##############################################################################
@@ -766,15 +779,16 @@
 # system activity is enough.
 # ##############################################################################
 format_vmstat () {
-   cat > /tmp/pt-summary.awk <<-EOF
+   local file=$1
+   awk "
       BEGIN {
-         format = "  %2s %2s  %4s %4s %5s %5s %6s %6s %3s %3s %3s %3s %3s\n";
+         format = \"  %2s %2s  %4s %4s %5s %5s %6s %6s %3s %3s %3s %3s %3s\n\";
       }
       /procs/ {
-         print  "  procs  ---swap-- -----io---- ---system---- --------cpu--------";
+         print  \"  procs  ---swap-- -----io---- ---system---- --------cpu--------\";
       }
       /bo/ {
-         printf format, "r", "b", "si", "so", "bi", "bo", "ir", "cs", "us", "sy", "il", "wa", "st";
+         printf format, \"r\", \"b\", \"si\", \"so\", \"bi\", \"bo\", \"ir\", \"cs\", \"us\", \"sy\", \"il\", \"wa\", \"st\";
       }
       \$0 !~ /r/ {
             fuzzy_var = \$1;   ${fuzzy_formula}  r   = fuzzy_var;
@@ -792,9 +806,8 @@
             fuzzy_var = \$17;                    st  = fuzzy_var;
             printf format, r, b, si, so, bi, bo, ir, cs, us, sy, il, wa, st;
          }
-	EOF
-      awk -f /tmp/pt-summary.awk /tmp/percona-toolkit
-   }
+   " $file
+}
 
 # ##############################################################################
 # The main() function is called at the end of the script.  This makes it
@@ -931,7 +944,7 @@
       dmesg > /tmp/percona-toolkit 2>/dev/null
    fi
    if [ -s /tmp/percona-toolkit ]; then
-      virt="$(parse_virtualization_dmesg)"
+      virt="$(parse_virtualization_dmesg /tmp/percona-toolkit)"
    fi
    if [ -z "${virt}" ]; then
       if which lspci >/dev/null 2>&1; then
@@ -963,7 +976,7 @@
    section Processor
    if [ -f /proc/cpuinfo ]; then
       cat /proc/cpuinfo > /tmp/percona-toolkit 2>/dev/null
-      parse_proc_cpuinfo
+      parse_proc_cpuinfo /tmp/percona-toolkit
    elif [ "${platform}" = "FreeBSD" ]; then
       parse_sysctl_cpu_freebsd /tmp/percona-toolkit.sysctl
    elif [ "${platform}" = "SunOS" ]; then
@@ -995,7 +1008,7 @@
    fi
 
    if which dmidecode >/dev/null 2>&1 && dmidecode > /tmp/percona-toolkit 2>/dev/null; then
-      parse_dmidecode_mem_devices
+      parse_dmidecode_mem_devices /tmp/percona-toolkit
    fi
 
    # ########################################################################
@@ -1028,7 +1041,7 @@
 
       # Relies on /tmp/percona-toolkit having data from the Disk Schedulers loop.
       section "Disk_Partioning"
-      parse_fdisk
+      parse_fdisk /tmp/percona-toolkit
 
       section "Kernel_Inode_State"
       for file in dentry-state file-nr inode-nr; do
@@ -1052,14 +1065,14 @@
    # /var/log/dmesg if possible.
    # ########################################################################
    if which lspci >/dev/null 2>&1 && lspci > /tmp/percona-toolkit 2>/dev/null; then
-      controller="$(parse_raid_controller_lspci)"
+      controller="$(parse_raid_controller_lspci /tmp/percona-toolkit)"
    fi
    if [ -z "${controller}" ]; then
       cat /var/log/dmesg > /tmp/percona-toolkit 2>/dev/null
       if [ ! -s /tmp/percona-toolkit ]; then
          dmesg > /tmp/percona-toolkit 2>/dev/null
       fi
-      controller="$(parse_raid_controller_dmesg)"
+      controller="$(parse_raid_controller_dmesg /tmp/percona-toolkit)"
    fi
 
    name_val Controller "${controller:-No RAID controller detected}"
@@ -1073,28 +1086,28 @@
    notfound=""
    if [ "${controller}" = "AACRAID" ]; then
       if arcconf getconfig 1 > /tmp/percona-toolkit 2>/dev/null; then
-         parse_arcconf
+         parse_arcconf /tmp/percona-toolkit
       elif ! which arcconf >/dev/null 2>&1; then
          notfound="e.g. http://www.adaptec.com/en-US/support/raid/scsi_raid/ASR-2120S/"
       fi
    elif [ "${controller}" = "HP Smart Array" ]; then
       if hpacucli ctrl all show config > /tmp/percona-toolkit 2>/dev/null; then
-         parse_hpacucli
+         parse_hpacucli /tmp/percona-toolkit
       elif ! which hpacucli >/dev/null 2>&1; then
          notfound="your package repository or the manufacturer's website"
       fi
    elif [ "${controller}" = "LSI Logic MegaRAID SAS" ]; then
       if MegaCli64 -AdpAllInfo -aALL -NoLog > /tmp/percona-toolkit 2>/dev/null; then
-         parse_lsi_megaraid_adapter_info
+         parse_lsi_megaraid_adapter_info /tmp/percona-toolkit
       elif ! which MegaCli64 >/dev/null 2>&1; then
          notfound="your package repository or the manufacturer's website"
       fi
       if MegaCli64 -AdpBbuCmd -GetBbuStatus -aALL -NoLog > /tmp/percona-toolkit 2>/dev/null; then
-         parse_lsi_megaraid_bbu_status
+         parse_lsi_megaraid_bbu_status /tmp/percona-toolkit
       fi
       if MegaCli64 -LdPdInfo -aALL -NoLog > /tmp/percona-toolkit 2>/dev/null; then
-         parse_lsi_megaraid_virtual_devices
-         parse_lsi_megaraid_devices
+         parse_lsi_megaraid_virtual_devices /tmp/percona-toolkit
+         parse_lsi_megaraid_devices /tmp/percona-toolkit
       fi
    fi
 
@@ -1110,7 +1123,7 @@
       if [ "${platform}" = "Linux" ]; then
          section Network_Config
          if which lspci > /dev/null 2>&1 && lspci > /tmp/percona-toolkit 2>/dev/null; then
-            parse_ethernet_controller_lspci
+            parse_ethernet_controller_lspci /tmp/percona-toolkit
          fi
          if sysctl net.ipv4.tcp_fin_timeout > /dev/null 2>&1; then
             name_val "FIN Timeout" "$(sysctl net.ipv4.tcp_fin_timeout)"
@@ -1130,7 +1143,7 @@
       if [ "${platform}" = "Linux" ]; then
          section Network_Connections
          if netstat -antp > /tmp/percona-toolkit 2>/dev/null; then
-            parse_netstat
+            parse_netstat /tmp/percona-toolkit
          fi
       fi
    fi
@@ -1153,7 +1166,7 @@
          section "Simplified_and_fuzzy_rounded_vmstat_(wait_please)"
          vmstat 1 5 > /tmp/percona-toolkit
          if [ "${platform}" = "Linux" ]; then
-            format_vmstat
+            format_vmstat /tmp/percona-toolkit
          else
             # TODO: simplify/format for other platforms
             cat /tmp/percona-toolkit
 
=== removed file 't/pt-diskstats/group-by-all-01'
--- t/pt-diskstats/group-by-all-01	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-all-01	1970-01-01 00:00:00 +0000
@@ -1,41 +0,0 @@
-#!/bin/bash
-#group_by_all samples/diskstats-001.txt
-
-cat <<EOF > $1
-  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  2.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  2.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    23.0    53.2     0.6    85%    0.0     0.9   0%      0
-  2.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  2.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    23.0    53.2     0.6    85%    0.0     0.9   0%      0
-  2.0 cciss/c0d1     466.5    44.6    10.2     0%   11.2    23.9   985.0    47.5    22.8     0%    0.1     0.1  92%     18
-  2.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  2.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0   153.0     8.0     0.6     0%    0.1     0.8   0%      0
-  2.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  4.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  4.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    16.0    35.5     0.3    77%    0.0     0.4   0%      0
-  4.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  4.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    16.0    35.5     0.3    77%    0.0     0.4   0%      0
-  4.0 cciss/c0d1     373.0    47.2     8.6     0%   10.2    27.4   560.0    46.2    12.6     0%    0.1     0.1  91%     17
-  4.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  4.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  4.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  5.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  5.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0     4.0    62.0     0.1    87%    0.0     0.0   0%      0
-  5.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  5.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0     4.0    62.0     0.1    87%    0.0     0.0   0%      0
-  5.0 cciss/c0d1     848.0    42.6    17.7     0%   21.6    25.5  1979.0    49.7    48.0     0%    0.2     0.1 178%      9
-  5.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  5.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  5.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  7.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  7.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    21.0    74.7     0.8    89%    0.0     0.5   0%      0
-  7.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  7.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    21.0    74.7     0.8    89%    0.0     0.5   0%      0
-  7.0 cciss/c0d1     340.0    36.6     6.1     0%    8.1    23.8   913.0    49.4    22.0     0%    0.1     0.1  86%      5
-  7.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  7.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0   194.5     8.0     0.8     0%    0.1     0.6   0%      0
-  7.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-EOF
 
=== removed file 't/pt-diskstats/group-by-disk-01'
--- t/pt-diskstats/group-by-disk-01	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-disk-01	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-#group_by_disk samples/diskstats-001.txt
-
-cat <<EOF > $1
-  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  {4} ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  {4} cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    17.7    56.2     0.5    86%    0.0     0.6   0%      0
-  {4} cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  {4} cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    17.7    56.2     0.5    86%    0.0     0.6   0%      0
-  {4} cciss/c0d1     458.1    43.0     9.6     0%   11.5    25.1   985.0    48.4    23.3     0%    0.1     0.1 102%      0
-  {4} cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-  {4} dm-0             0.0     0.0     0.0     0%    0.0     0.0    99.3     8.0     0.4     0%    0.1     0.7   0%      0
-  {4} md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
-EOF
 
=== removed file 't/pt-diskstats/group-by-disk-02'
--- t/pt-diskstats/group-by-disk-02	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-disk-02	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-#group_by_disk samples/diskstats-005.txt
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  {5} sda3    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
-  {5} sda4    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
-EOF
 
=== removed file 't/pt-diskstats/group-by-disk-03'
--- t/pt-diskstats/group-by-disk-03	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-disk-03	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-#group_by_disk /tmp/aspersa
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  {5} sda3    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
-  {5} sda4    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
-EOF
-
-cat > $2 <<EOF
-TS 1298130002.073935000
-EOF
-cat >>$2 samples/diskstats-005.txt
 
=== removed file 't/pt-diskstats/group-by-disk-04'
--- t/pt-diskstats/group-by-disk-04	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-disk-04	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-#group_by_disk /tmp/aspersa
-
-cat <<EOF > $1
-EOF
-
-cat <<EOF > $2
-TS 1297205887.156653000
-   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
-TS 1297205888.161613000
-EOF
 
=== removed file 't/pt-diskstats/group-by-disk-05'
--- t/pt-diskstats/group-by-disk-05	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-disk-05	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#!/bin/bash
-#group_by_disk /tmp/aspersa
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  {1} ram0       1.0     1.0     0.0    50%    0.0     1.0     1.0     1.0     0.0    50%    0.0     1.0   0%      0
-EOF
-
-cat <<EOF > $2
-   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
-TS 1297205887.156653000
-   1    0 ram0 1 1 1 1 1 1 1 1 1 1 1
-TS 1297205888.161613000
-EOF
 
=== removed file 't/pt-diskstats/group-by-sample-01'
--- t/pt-diskstats/group-by-sample-01	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-sample-01	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-#group_by_sample samples/diskstats-001.txt
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  2.0 {8}      466.5    44.6    10.2     0%    1.4    23.9  1184.0    42.6    24.6    18%    0.0     0.2  12%     18
-  4.0 {8}      373.0    47.2     8.6     0%    1.3    27.4   592.0    45.6    13.2    16%    0.0     0.1  11%     17
-  5.0 {8}      848.0    42.6    17.7     0%    2.7    25.5  1987.0    49.8    48.3     3%    0.0     0.1  22%      9
-  7.0 {8}      340.0    36.6     6.1     0%    1.0    23.8  1149.5    43.4    24.3    23%    0.0     0.2  11%      5
-EOF
 
=== removed file 't/pt-diskstats/group-by-sample-02'
--- t/pt-diskstats/group-by-sample-02	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-sample-02	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-#!/bin/bash
-#group_by_sample /tmp/aspersa
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  1.0 sda3    1406.0    32.0    21.9     1%    0.6     0.4    46.3    61.1     1.4    67%    0.0     0.3  41%      0
-  2.0 sda3    1580.1    31.9    24.6     1%    0.6     0.4   163.7    62.2     5.0    36%    0.1     0.3  46%      1
-  3.0 sda3    1296.7    32.0    20.2     1%    0.5     0.4    51.3    50.5     1.3    62%    0.0     0.3  42%      1
-  4.1 sda3    1429.7    32.0    22.3     1%    0.5     0.3    73.9    61.0     2.2    57%    0.0     0.3  40%      0
-  5.1 sda3    1258.1    32.0    19.6     1%    0.4     0.3   158.7    68.8     5.3    36%    0.1     0.4  37%      0
-EOF
-
-cat > $2 <<EOF
-   8    3 sda3 4257315954 34043324 136169413346 1922644483 492348396 547079617 32764474048 248191881 0 1348454960 2169768832
-TS 1298130003.073935000
-   8    3 sda3 4257317380 34043342 136169458914 1922645044 492348443 547079711 32764476920 248191896 0 1348455373 2169769408
-TS 1298130004.088149000
-   8    3 sda3 4257318982 34043364 136169510082 1922645662 492348609 547079803 32764487248 248191947 1 1348455841 2169770075
-TS 1298130005.102035000
-   8    3 sda3 4257320297 34043384 136169552098 1922646173 492348661 547079889 32764489872 248191964 1 1348456262 2169770603
-TS 1298130006.116158000
-   8    3 sda3 4257321748 34043394 136169598530 1922646672 492348736 547079990 32764494448 248191983 0 1348456671 2169771121
-TS 1298130007.131062000
-   8    3 sda3 4257323024 34043406 136169639330 1922647105 492348897 547080080 32764505520 248192043 0 1348457045 2169771613
-TS 1298130008.145277000
-EOF
-
-# The below is incremental samples of the data and timestamps:
-# TS_diff    reads reads_mrg read_sectors ms_reading    writes write_mrg wrt_sectors ms_wrting  i ms_ding_io ms_weightd
-# 1.14214000 1426         18        45568        561        47        94        2872        15  0        413        576
-# 1.13886000 1602         22        51168        618       166        92       10328        51  1        468        667
-# 1.14123000 1315         20        42016        511        52        86        2624        17  1        421        528
-# 1.14904000 1451         10        46432        499        75       101        4576        19  0        409        518
-# 1.14215000 1276         12        40800        433       161        90       11072        60  0        374        492
 
=== removed file 't/pt-diskstats/group-by-sample-03'
--- t/pt-diskstats/group-by-sample-03	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-sample-03	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-#group_by_sample samples/diskstats-005.txt
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  1.0 {2}     2812.0    32.0    43.9     1%    0.6     0.4    92.7    61.1     2.8    67%    0.0     0.3  41%      0
-  2.0 {2}     3160.1    31.9    49.3     1%    0.6     0.4   327.5    62.2     9.9    36%    0.1     0.3  46%      2
-  3.0 {2}     2593.4    32.0    40.5     1%    0.5     0.4   102.6    50.5     2.5    62%    0.0     0.3  42%      2
-  4.1 {2}     2859.4    32.0    44.7     1%    0.5     0.3   147.8    61.0     4.4    57%    0.0     0.3  40%      0
-  5.1 {2}     2516.2    32.0    39.3     1%    0.4     0.3   317.5    68.8    10.7    36%    0.1     0.4  37%      0
-EOF
 
=== removed file 't/pt-diskstats/group-by-sample-04'
--- t/pt-diskstats/group-by-sample-04	2011-07-01 16:29:50 +0000
+++ t/pt-diskstats/group-by-sample-04	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash
-#group_by_sample /tmp/aspersa
-
-cat <<EOF > $1
-  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
-  1.0 {2}     2812.0    32.0    43.9     1%    0.6     0.4    92.7    61.1     2.8    67%    0.0     0.3  41%      0
-  2.0 {2}     3160.1    31.9    49.3     1%    0.6     0.4   327.5    62.2     9.9    36%    0.1     0.3  46%      2
-  3.0 {2}     2593.4    32.0    40.5     1%    0.5     0.4   102.6    50.5     2.5    62%    0.0     0.3  42%      2
-  4.1 {2}     2859.4    32.0    44.7     1%    0.5     0.3   147.8    61.0     4.4    57%    0.0     0.3  40%      0
-  5.1 {2}     2516.2    32.0    39.3     1%    0.4     0.3   317.5    68.8    10.7    36%    0.1     0.4  37%      0
-EOF
-
-cat > $2 <<EOF
-TS 1298130002.073935000
-EOF
-cat >>$2 samples/diskstats-005.txt
 
=== added file 't/pt-diskstats/group_by_all.sh'
--- t/pt-diskstats/group_by_all.sh	1970-01-01 00:00:00 +0000
+++ t/pt-diskstats/group_by_all.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+# This test file must be ran by util/test-bash-functions.
+
+TESTS=1
+
+cat <<EOF > $TMPDIR/expected
+  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  2.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  2.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    23.0    53.2     0.6    85%    0.0     0.9   0%      0
+  2.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  2.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    23.0    53.2     0.6    85%    0.0     0.9   0%      0
+  2.0 cciss/c0d1     466.5    44.6    10.2     0%   11.2    23.9   985.0    47.5    22.8     0%    0.1     0.1  92%     18
+  2.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  2.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0   153.0     8.0     0.6     0%    0.1     0.8   0%      0
+  2.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  4.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  4.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    16.0    35.5     0.3    77%    0.0     0.4   0%      0
+  4.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  4.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    16.0    35.5     0.3    77%    0.0     0.4   0%      0
+  4.0 cciss/c0d1     373.0    47.2     8.6     0%   10.2    27.4   560.0    46.2    12.6     0%    0.1     0.1  91%     17
+  4.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  4.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  4.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  5.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  5.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0     4.0    62.0     0.1    87%    0.0     0.0   0%      0
+  5.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  5.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0     4.0    62.0     0.1    87%    0.0     0.0   0%      0
+  5.0 cciss/c0d1     848.0    42.6    17.7     0%   21.6    25.5  1979.0    49.7    48.0     0%    0.2     0.1 178%      9
+  5.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  5.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  5.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  7.0 ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  7.0 cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    21.0    74.7     0.8    89%    0.0     0.5   0%      0
+  7.0 cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  7.0 cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    21.0    74.7     0.8    89%    0.0     0.5   0%      0
+  7.0 cciss/c0d1     340.0    36.6     6.1     0%    8.1    23.8   913.0    49.4    22.0     0%    0.1     0.1  86%      5
+  7.0 cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  7.0 dm-0             0.0     0.0     0.0     0%    0.0     0.0   194.5     8.0     0.8     0%    0.1     0.6   0%      0
+  7.0 md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+EOF
+
+group_by_all "samples/diskstats-001.txt" > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== added file 't/pt-diskstats/group_by_disk.sh'
--- t/pt-diskstats/group_by_disk.sh	1970-01-01 00:00:00 +0000
+++ t/pt-diskstats/group_by_disk.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+# This test file must be ran by util/test-bash-functions.
+
+TESTS=5
+
+TEST_NAME="diskstats-001.txt"
+cat <<EOF > $TMPDIR/expected
+  #ts device          rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  {4} ram0             0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  {4} cciss/c0d0       0.0     0.0     0.0     0%    0.0     0.0    17.7    56.2     0.5    86%    0.0     0.6   0%      0
+  {4} cciss/c0d0p1     0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  {4} cciss/c0d0p2     0.0     0.0     0.0     0%    0.0     0.0    17.7    56.2     0.5    86%    0.0     0.6   0%      0
+  {4} cciss/c0d1     458.1    43.0     9.6     0%   11.5    25.1   985.0    48.4    23.3     0%    0.1     0.1 102%      0
+  {4} cciss/c1d0       0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+  {4} dm-0             0.0     0.0     0.0     0%    0.0     0.0    99.3     8.0     0.4     0%    0.1     0.7   0%      0
+  {4} md0              0.0     0.0     0.0     0%    0.0     0.0     0.0     0.0     0.0     0%    0.0     0.0   0%      0
+EOF
+group_by_disk samples/diskstats-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+TEST_NAME="diskstats-005.txt"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  {5} sda3    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
+  {5} sda4    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
+EOF
+group_by_disk samples/diskstats-005.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+TEST_NAME="diskstats-005.txt with TS"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  {5} sda3    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
+  {5} sda4    1394.1    32.0    21.8     1%    0.5     0.4    98.8    62.8     3.0    48%    0.0     0.3  41%      0
+EOF
+
+cat > $TMPDIR/in <<EOF
+TS 1298130002.073935000
+EOF
+cat samples/diskstats-005.txt >> $TMPDIR/in
+group_by_disk $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+TEST_NAME="no output"
+cat <<EOF > $TMPDIR/expected
+EOF
+
+cat <<EOF > $TMPDIR/in
+TS 1297205887.156653000
+   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
+TS 1297205888.161613000
+EOF
+group_by_disk $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+TEST_NAME="timestamps"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  {1} ram0       1.0     1.0     0.0    50%    0.0     1.0     1.0     1.0     0.0    50%    0.0     1.0   0%      0
+EOF
+
+cat <<EOF > $TMPDIR/in
+   1    0 ram0 0 0 0 0 0 0 0 0 0 0 0
+TS 1297205887.156653000
+   1    0 ram0 1 1 1 1 1 1 1 1 1 1 1
+TS 1297205888.161613000
+EOF
+group_by_disk $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== added file 't/pt-diskstats/group_by_sample.sh'
--- t/pt-diskstats/group_by_sample.sh	1970-01-01 00:00:00 +0000
+++ t/pt-diskstats/group_by_sample.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,84 @@
+#!/usr/bin/env bash
+
+# This test file must be ran by util/test-bash-functions.
+
+TESTS=4
+
+TEST_NAME="diskstats-001.txt"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  2.0 {8}      466.5    44.6    10.2     0%    1.4    23.9  1184.0    42.6    24.6    18%    0.0     0.2  12%     18
+  4.0 {8}      373.0    47.2     8.6     0%    1.3    27.4   592.0    45.6    13.2    16%    0.0     0.1  11%     17
+  5.0 {8}      848.0    42.6    17.7     0%    2.7    25.5  1987.0    49.8    48.3     3%    0.0     0.1  22%      9
+  7.0 {8}      340.0    36.6     6.1     0%    1.0    23.8  1149.5    43.4    24.3    23%    0.0     0.2  11%      5
+EOF
+group_by_sample samples/diskstats-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+TEST_NAME="input 1"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  1.0 sda3    1406.0    32.0    21.9     1%    0.6     0.4    46.3    61.1     1.4    67%    0.0     0.3  41%      0
+  2.0 sda3    1580.1    31.9    24.6     1%    0.6     0.4   163.7    62.2     5.0    36%    0.1     0.3  46%      1
+  3.0 sda3    1296.7    32.0    20.2     1%    0.5     0.4    51.3    50.5     1.3    62%    0.0     0.3  42%      1
+  4.1 sda3    1429.7    32.0    22.3     1%    0.5     0.3    73.9    61.0     2.2    57%    0.0     0.3  40%      0
+  5.1 sda3    1258.1    32.0    19.6     1%    0.4     0.3   158.7    68.8     5.3    36%    0.1     0.4  37%      0
+EOF
+
+cat > $TMPDIR/in <<EOF
+   8    3 sda3 4257315954 34043324 136169413346 1922644483 492348396 547079617 32764474048 248191881 0 1348454960 2169768832
+TS 1298130003.073935000
+   8    3 sda3 4257317380 34043342 136169458914 1922645044 492348443 547079711 32764476920 248191896 0 1348455373 2169769408
+TS 1298130004.088149000
+   8    3 sda3 4257318982 34043364 136169510082 1922645662 492348609 547079803 32764487248 248191947 1 1348455841 2169770075
+TS 1298130005.102035000
+   8    3 sda3 4257320297 34043384 136169552098 1922646173 492348661 547079889 32764489872 248191964 1 1348456262 2169770603
+TS 1298130006.116158000
+   8    3 sda3 4257321748 34043394 136169598530 1922646672 492348736 547079990 32764494448 248191983 0 1348456671 2169771121
+TS 1298130007.131062000
+   8    3 sda3 4257323024 34043406 136169639330 1922647105 492348897 547080080 32764505520 248192043 0 1348457045 2169771613
+TS 1298130008.145277000
+EOF
+group_by_sample $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+# The below is incremental samples of the data and timestamps:
+# TS_diff    reads reads_mrg read_sectors ms_reading    writes write_mrg wrt_sectors ms_wrting  i ms_ding_io ms_weightd
+# 1.14214000 1426         18        45568        561        47        94        2872        15  0        413        576
+# 1.13886000 1602         22        51168        618       166        92       10328        51  1        468        667
+# 1.14123000 1315         20        42016        511        52        86        2624        17  1        421        528
+# 1.14904000 1451         10        46432        499        75       101        4576        19  0        409        518
+# 1.14215000 1276         12        40800        433       161        90       11072        60  0        374        492
+
+
+TEST_NAME="diskstats-005.txt"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  1.0 {2}     2812.0    32.0    43.9     1%    0.6     0.4    92.7    61.1     2.8    67%    0.0     0.3  41%      0
+  2.0 {2}     3160.1    31.9    49.3     1%    0.6     0.4   327.5    62.2     9.9    36%    0.1     0.3  46%      2
+  3.0 {2}     2593.4    32.0    40.5     1%    0.5     0.4   102.6    50.5     2.5    62%    0.0     0.3  42%      2
+  4.1 {2}     2859.4    32.0    44.7     1%    0.5     0.3   147.8    61.0     4.4    57%    0.0     0.3  40%      0
+  5.1 {2}     2516.2    32.0    39.3     1%    0.4     0.3   317.5    68.8    10.7    36%    0.1     0.4  37%      0
+EOF
+group_by_sample samples/diskstats-005.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+TEST_NAME="ts line"
+cat <<EOF > $TMPDIR/expected
+  #ts device    rd_s rd_avkb rd_mb_s rd_mrg rd_cnc   rd_rt    wr_s wr_avkb wr_mb_s wr_mrg wr_cnc   wr_rt busy in_prg
+  1.0 {2}     2812.0    32.0    43.9     1%    0.6     0.4    92.7    61.1     2.8    67%    0.0     0.3  41%      0
+  2.0 {2}     3160.1    31.9    49.3     1%    0.6     0.4   327.5    62.2     9.9    36%    0.1     0.3  46%      2
+  3.0 {2}     2593.4    32.0    40.5     1%    0.5     0.4   102.6    50.5     2.5    62%    0.0     0.3  42%      2
+  4.1 {2}     2859.4    32.0    44.7     1%    0.5     0.3   147.8    61.0     4.4    57%    0.0     0.3  40%      0
+  5.1 {2}     2516.2    32.0    39.3     1%    0.4     0.3   317.5    68.8    10.7    36%    0.1     0.4  37%      0
+EOF
+
+cat > $TMPDIR/in <<EOF
+TS 1298130002.073935000
+EOF
+cat samples/diskstats-005.txt >> $TMPDIR/in
+group_by_sample $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== modified file 't/pt-diskstats/pt-diskstats.t'
--- t/pt-diskstats/pt-diskstats.t	2011-07-12 22:56:55 +0000
+++ t/pt-diskstats/pt-diskstats.t	2011-08-19 17:39:24 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/evn perl
+#!/usr/bin/env perl
 
 BEGIN {
    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@
 
 use PerconaTest;
 
-system("$trunk/util/test-bash-tool pt-diskstats @ARGV");
+my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
+push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
+system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
 
 exit;
 
=== removed file 't/pt-mysql-summary/find-my-cnf-file-01'
--- t/pt-mysql-summary/find-my-cnf-file-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/find-my-cnf-file-01	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-#find_my_cnf_file 12346
-
-echo /tmp/12346/my.sandbox.cnf > $1
-
-cp samples/ps-mysqld-001.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/find-my-cnf-file-02'
--- t/pt-mysql-summary/find-my-cnf-file-02	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/find-my-cnf-file-02	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-#find_my_cnf_file 12345
-
-echo /var/lib/mysql/my.cnf > $1
-
-cp samples/ps-mysqld-004.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/find-my-cnf-file-03'
--- t/pt-mysql-summary/find-my-cnf-file-03	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/find-my-cnf-file-03	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-#find_my_cnf_file
-
-echo /var/lib/mysql/my.cnf > $1
-
-cp samples/ps-mysqld-004.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/find-my-cnf-file-04'
--- t/pt-mysql-summary/find-my-cnf-file-04	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/find-my-cnf-file-04	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-#find_my_cnf_file
-
-echo /tmp/12345/my.sandbox.cnf > $1
-
-cp samples/ps-mysqld-001.txt /tmp/percona-toolkit
 
=== added file 't/pt-mysql-summary/find_my_cnf_file.sh'
--- t/pt-mysql-summary/find_my_cnf_file.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/find_my_cnf_file.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+TESTS=4
+
+TEST_NAME="ps-mysqld-001.txt"
+res=$(find_my_cnf_file samples/ps-mysqld-001.txt)
+is "$res" "/tmp/12345/my.sandbox.cnf"
+
+TEST_NAME="ps-mysqld-001.txt with port"
+res=$(find_my_cnf_file samples/ps-mysqld-001.txt 12346)
+is "$res" "/tmp/12346/my.sandbox.cnf"
+
+TEST_NAME="ps-mysqld-004.txt"
+res=$(find_my_cnf_file samples/ps-mysqld-004.txt)
+is "$res" "/var/lib/mysql/my.cnf"
+
+TEST_NAME="ps-mysqld-004.txt with port"
+res=$(find_my_cnf_file samples/ps-mysqld-004.txt 12345)
+is "$res" "/var/lib/mysql/my.cnf"
 
=== removed file 't/pt-mysql-summary/format-innodb-status-01'
--- t/pt-mysql-summary/format-innodb-status-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/format-innodb-status-01	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-#!/bin/bash
-#format_innodb_status /tmp/percona-toolkit-innodb-status
-
-cat <<EOF > $1
-      Checkpoint Age | 619k
-        InnoDB Queue | 0 queries inside InnoDB, 0 queries in queue
-  Oldest Transaction | 3 Seconds
-    History List Len | 255
-          Read Views | 23
-    Undo Log Entries | 0 transactions, 0 total undo, 0 max undo
-   Pending I/O Reads | 14 buf pool reads, 6 normal AIO, 0 ibuf AIO, 23 preads
-  Pending I/O Writes | 63 buf pool (63 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (1 log, 0 chkp); 0 pwrites
- Pending I/O Flushes | 0 buf pool, 1 log
-  Transaction States | 1xACTIVE
-Semaphore Waits
-     69 btr/btr0cur.c line 457
-     47 btr/btr0cur.c line 523
-     17 trx/trx0trx.c line 1621
-     12 row/row0sel.c line 3549
-      4 lock/lock0lock.c line 4944
-      3 lock/lock0lock.c line 5316
-      2 lock/lock0lock.c line 3224
-      2 btr/btr0sea.c line 1032
-      1 trx/trx0trx.c line 738
-      1 row/row0sel.c line 4574
-      1 lock/lock0lock.c line 5163
-      1 lock/lock0lock.c line 3249
-      1 ./include/btr0btr.ic line 53
-      1 fsp/fsp0fsp.c line 3395
-      1 btr/btr0cur.c line 672
-      1 btr/btr0cur.c line 450
-Semaphore Holders
-     66 thread id 139960165583184
-     45 thread id 139960567171408
-      4 thread id 139960404199760
-      1 thread id 139961215367504
-      1 thread id 139960969292112
-      1 thread id 139960676096336
-Mutexes/Locks Waited For
-     65 lock on RW-latch at 0x905d33d0 '&new_index->lock'
-     45 lock on RW-latch at 0x7f4bedbf8810 '&block->lock'
-     30 Mutex at 0xf89ab0 '&kernel_mutex'
-     15 lock on RW-latch at 0x90075530 '&btr_search_latch'
-      4 lock on RW-latch at 0x90a42ca0 '&new_index->lock'
-      1 lock on RW-latch at 0x90fe1c80 '&new_index->lock'
-      1 lock on RW-latch at 0x90078f10 '&space->latch'
-      1 lock on RW-latch at 0x7f4c0d3abba8 '&block->lock'
-      1 lock on RW-latch at 0x7f4bfc558040 '&block->lock'
-      1 lock on RW-latch at 0x7f4bd0a8c8d0 '&block->lock'
-EOF
-
-cp samples/innodb-status.001.txt /tmp/percona-toolkit-innodb-status
 
=== removed file 't/pt-mysql-summary/format-innodb-status-02'
--- t/pt-mysql-summary/format-innodb-status-02	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/format-innodb-status-02	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-#!/bin/bash
-#format_innodb_status /tmp/percona-toolkit-innodb-status
-
-cat <<'EOF' > $1
-      Checkpoint Age | 348M
-        InnoDB Queue | 0 queries inside InnoDB, 0 queries in queue
-  Oldest Transaction | 4 Seconds
-    History List Len | 426
-          Read Views | 583
-    Undo Log Entries | 71 transactions, 247 total undo, 46 max undo
-   Pending I/O Reads | 0 buf pool reads, 0 normal AIO, 0 ibuf AIO, 0 preads
-  Pending I/O Writes | 0 buf pool (0 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (0 log, 0 chkp); 0 pwrites
- Pending I/O Flushes | 0 buf pool, 0 log
-  Transaction States | 1xACTIVE, 70xACTIVE (PREPARED)
-Tables Locked
-     62 `citydb`.`player_buildings`
-     46 `citydb`.`players`
-     22 `citydb`.`city_grid`
-     17 `citydb`.`player_stats`
-      6 `citydb`.`player_contracts`
-      1 `citydb`.`player_achievements`
-Semaphore Waits
-     23 trx/trx0undo.c line 1796
-     10 trx/trx0trx.c line 1888
-      8 trx/trx0trx.c line 1033
-      7 trx/trx0trx.c line 738
-      1 lock/lock0lock.c line 3770
-      1 ./include/log0log.ic line 322
-Mutexes/Locks Waited For
-     33 Mutex at 0x2abf68b76a18 '&rseg->mutex'
-     16 Mutex at 0x48ace40 '&kernel_mutex'
-      1 Mutex at 0x2abf68b6c0d0 '&log_sys->mutex'
-EOF
-
-cp samples/innodb-status.002.txt /tmp/percona-toolkit-innodb-status
 
=== removed file 't/pt-mysql-summary/format-innodb-status-03'
--- t/pt-mysql-summary/format-innodb-status-03	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/format-innodb-status-03	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-#format_innodb_status /tmp/percona-toolkit-innodb-status
-
-cat <<'EOF' > $1
-      Checkpoint Age | 0k
-        InnoDB Queue | 0 queries inside InnoDB, 0 queries in queue
-  Oldest Transaction | 35 Seconds
-    History List Len | 11
-          Read Views | 1
-    Undo Log Entries | 0 transactions, 0 total undo, 0 max undo
-   Pending I/O Reads | 0 buf pool reads, 0 normal AIO, 0 ibuf AIO, 0 preads
-  Pending I/O Writes | 0 buf pool (0 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (0 log, 0 chkp); 0 pwrites
- Pending I/O Flushes | 0 buf pool, 0 log
-  Transaction States | 1xACTIVE, 1xnot started
-Tables Locked
-      1 `test`.`t`
-EOF
-
-cp samples/innodb-status.003.txt /tmp/percona-toolkit-innodb-status
 
=== removed file 't/pt-mysql-summary/format-innodb-status-04'
--- t/pt-mysql-summary/format-innodb-status-04	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/format-innodb-status-04	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-#!/bin/bash
-#format_innodb_status /tmp/percona-toolkit-innodb-status
-
-cat <<'EOF' > $1
-      Checkpoint Age | 93M
-        InnoDB Queue | 9 queries inside InnoDB, 0 queries in queue
-  Oldest Transaction | 263 Seconds
-    History List Len | 1282
-          Read Views | 10
-    Undo Log Entries | 3 transactions, 276797 total undo, 153341 max undo
-   Pending I/O Reads | 50 buf pool reads, 48 normal AIO, 0 ibuf AIO, 2 preads
-  Pending I/O Writes | 0 buf pool (0 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (0 log, 0 chkp); 0 pwrites
- Pending I/O Flushes | 0 buf pool, 0 log
-  Transaction States | 9xACTIVE, 57xnot started
-Semaphore Waits
-      3 row/row0sel.c line 3495
-      2 btr/btr0sea.c line 1024
-      1 btr/btr0sea.c line 1170
-      1 btr/btr0cur.c line 443
-      1 btr/btr0cur.c line 1501
-Semaphore Holders
-      7 thread id 1220999488
-      1 thread id 1229429056
-Mutexes/Locks Waited For
-      7 lock on RW-latch at 0x2aaab42120b8 created in file btr/btr0sea.c line 139
-      1 lock on RW-latch at 0x2ab2c679a550 created in file buf/buf0buf.c line 550
-EOF
-
-cp samples/innodb-status.004.txt /tmp/percona-toolkit-innodb-status
 
=== added file 't/pt-mysql-summary/format_binlog_filters.sh'
--- t/pt-mysql-summary/format_binlog_filters.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/format_binlog_filters.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+TEST=1
+
+cat <<EOF > $TMPDIR/expected
+        binlog_do_db | foo
+    binlog_ignore_db | mysql,test
+EOF
+
+format_binlog_filters samples/mysql-show-master-status-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== added file 't/pt-mysql-summary/format_innodb_status.sh'
--- t/pt-mysql-summary/format_innodb_status.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/format_innodb_status.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,146 @@
+#!/usr/bin/env bash
+
+TESTS=4
+
+# ############################################################################
+TEST_NAME="innodb-status.001.txt"
+# ############################################################################
+cat <<EOF > $TMPDIR/expected
+      Checkpoint Age | 619k
+        InnoDB Queue | 0 queries inside InnoDB, 0 queries in queue
+  Oldest Transaction | 3 Seconds
+    History List Len | 255
+          Read Views | 23
+    Undo Log Entries | 0 transactions, 0 total undo, 0 max undo
+   Pending I/O Reads | 14 buf pool reads, 6 normal AIO, 0 ibuf AIO, 23 preads
+  Pending I/O Writes | 63 buf pool (63 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (1 log, 0 chkp); 0 pwrites
+ Pending I/O Flushes | 0 buf pool, 1 log
+  Transaction States | 1xACTIVE
+Semaphore Waits
+     69 btr/btr0cur.c line 457
+     47 btr/btr0cur.c line 523
+     17 trx/trx0trx.c line 1621
+     12 row/row0sel.c line 3549
+      4 lock/lock0lock.c line 4944
+      3 lock/lock0lock.c line 5316
+      2 lock/lock0lock.c line 3224
+      2 btr/btr0sea.c line 1032
+      1 trx/trx0trx.c line 738
+      1 row/row0sel.c line 4574
+      1 lock/lock0lock.c line 5163
+      1 lock/lock0lock.c line 3249
+      1 ./include/btr0btr.ic line 53
+      1 fsp/fsp0fsp.c line 3395
+      1 btr/btr0cur.c line 672
+      1 btr/btr0cur.c line 450
+Semaphore Holders
+     66 thread id 139960165583184
+     45 thread id 139960567171408
+      4 thread id 139960404199760
+      1 thread id 139961215367504
+      1 thread id 139960969292112
+      1 thread id 139960676096336
+Mutexes/Locks Waited For
+     65 lock on RW-latch at 0x905d33d0 '&new_index->lock'
+     45 lock on RW-latch at 0x7f4bedbf8810 '&block->lock'
+     30 Mutex at 0xf89ab0 '&kernel_mutex'
+     15 lock on RW-latch at 0x90075530 '&btr_search_latch'
+      4 lock on RW-latch at 0x90a42ca0 '&new_index->lock'
+      1 lock on RW-latch at 0x90fe1c80 '&new_index->lock'
+      1 lock on RW-latch at 0x90078f10 '&space->latch'
+      1 lock on RW-latch at 0x7f4c0d3abba8 '&block->lock'
+      1 lock on RW-latch at 0x7f4bfc558040 '&block->lock'
+      1 lock on RW-latch at 0x7f4bd0a8c8d0 '&block->lock'
+EOF
+
+format_innodb_status samples/innodb-status.001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="innodb-status.002.txt"
+# ############################################################################
+cat <<'EOF' > $TMPDIR/expected
+      Checkpoint Age | 348M
+        InnoDB Queue | 0 queries inside InnoDB, 0 queries in queue
+  Oldest Transaction | 4 Seconds
+    History List Len | 426
+          Read Views | 583
+    Undo Log Entries | 71 transactions, 247 total undo, 46 max undo
+   Pending I/O Reads | 0 buf pool reads, 0 normal AIO, 0 ibuf AIO, 0 preads
+  Pending I/O Writes | 0 buf pool (0 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (0 log, 0 chkp); 0 pwrites
+ Pending I/O Flushes | 0 buf pool, 0 log
+  Transaction States | 1xACTIVE, 70xACTIVE (PREPARED)
+Tables Locked
+     62 `citydb`.`player_buildings`
+     46 `citydb`.`players`
+     22 `citydb`.`city_grid`
+     17 `citydb`.`player_stats`
+      6 `citydb`.`player_contracts`
+      1 `citydb`.`player_achievements`
+Semaphore Waits
+     23 trx/trx0undo.c line 1796
+     10 trx/trx0trx.c line 1888
+      8 trx/trx0trx.c line 1033
+      7 trx/trx0trx.c line 738
+      1 lock/lock0lock.c line 3770
+      1 ./include/log0log.ic line 322
+Mutexes/Locks Waited For
+     33 Mutex at 0x2abf68b76a18 '&rseg->mutex'
+     16 Mutex at 0x48ace40 '&kernel_mutex'
+      1 Mutex at 0x2abf68b6c0d0 '&log_sys->mutex'
+EOF
+
+format_innodb_status samples/innodb-status.002.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="innodb-status.003.txt"
+# ############################################################################
+cat <<'EOF' > $TMPDIR/expected
+      Checkpoint Age | 0k
+        InnoDB Queue | 0 queries inside InnoDB, 0 queries in queue
+  Oldest Transaction | 35 Seconds
+    History List Len | 11
+          Read Views | 1
+    Undo Log Entries | 0 transactions, 0 total undo, 0 max undo
+   Pending I/O Reads | 0 buf pool reads, 0 normal AIO, 0 ibuf AIO, 0 preads
+  Pending I/O Writes | 0 buf pool (0 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (0 log, 0 chkp); 0 pwrites
+ Pending I/O Flushes | 0 buf pool, 0 log
+  Transaction States | 1xACTIVE, 1xnot started
+Tables Locked
+      1 `test`.`t`
+EOF
+
+format_innodb_status samples/innodb-status.003.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="innodb-status.004.txt" 
+# ############################################################################
+cat <<'EOF' > $TMPDIR/expected
+      Checkpoint Age | 93M
+        InnoDB Queue | 9 queries inside InnoDB, 0 queries in queue
+  Oldest Transaction | 263 Seconds
+    History List Len | 1282
+          Read Views | 10
+    Undo Log Entries | 3 transactions, 276797 total undo, 153341 max undo
+   Pending I/O Reads | 50 buf pool reads, 48 normal AIO, 0 ibuf AIO, 2 preads
+  Pending I/O Writes | 0 buf pool (0 LRU, 0 flush list, 0 page); 0 AIO, 0 sync, 0 log IO (0 log, 0 chkp); 0 pwrites
+ Pending I/O Flushes | 0 buf pool, 0 log
+  Transaction States | 9xACTIVE, 57xnot started
+Semaphore Waits
+      3 row/row0sel.c line 3495
+      2 btr/btr0sea.c line 1024
+      1 btr/btr0sea.c line 1170
+      1 btr/btr0cur.c line 443
+      1 btr/btr0cur.c line 1501
+Semaphore Holders
+      7 thread id 1220999488
+      1 thread id 1229429056
+Mutexes/Locks Waited For
+      7 lock on RW-latch at 0x2aaab42120b8 created in file btr/btr0sea.c line 139
+      1 lock on RW-latch at 0x2ab2c679a550 created in file buf/buf0buf.c line 550
+EOF
+
+format_innodb_status samples/innodb-status.004.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== added file 't/pt-mysql-summary/format_overall_db_stats.sh'
--- t/pt-mysql-summary/format_overall_db_stats.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/format_overall_db_stats.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+TESTS=2
+
+cat <<EOF > $TMPDIR/expected
+
+  Database Tables Views SPs Trigs Funcs   FKs Partn
+  mysql        17                                  
+  sakila       17     7   3     6     3    22     1
+
+  Database MyISAM InnoDB
+  mysql        17       
+  sakila        2     15
+
+  Database BTREE FULLTEXT
+  mysql       24         
+  sakila      63        1
+
+             c   t   s   e   t   s   i   t   b   l   b   v   d   y   d   m
+             h   i   e   n   i   m   n   e   l   o   i   a   a   e   e   e
+             a   m   t   u   n   a   t   x   o   n   g   r   t   a   c   d
+             r   e       m   y   l       t   b   g   i   c   e   r   i   i
+                 s           i   l               b   n   h   t       m   u
+                 t           n   i               l   t   a   i       a   m
+                 a           t   n               o       r   m       l   i
+                 m               t               b           e           n
+                 p                                                       t
+  Database === === === === === === === === === === === === === === === ===
+  mysql     38   5   5  69   2   3  16   2   4   1   2                    
+  sakila     1  15   1   3  19  26   3   4   1          45   4   1   7   2
+
+EOF
+format_overall_db_stats samples/mysql-schema-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+
+cat <<EOF > $TMPDIR/expected
+
+  Database Tables Views SPs Trigs Funcs   FKs Partn
+  {chosen}      1                                  
+
+  Database InnoDB
+  {chosen}      1
+
+  Database BTREE
+  {chosen}     2
+
+             t   v
+             i   a
+             n   r
+             y   c
+             i   h
+             n   a
+             t   r
+  Database === ===
+  {chosen}   1   1
+
+EOF
+format_overall_db_stats samples/mysql-schema-002.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== removed file 't/pt-mysql-summary/format_status_variables-01'
--- t/pt-mysql-summary/format_status_variables-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/format_status_variables-01	1970-01-01 00:00:00 +0000
@@ -1,93 +0,0 @@
-#!/bin/bash
-#format_status_variables
-
-cat <<EOF > $1
-Variable                                Per day  Per second      5 secs
-Bytes_received                          8000000         100            
-Bytes_sent                             35000000         400            
-Com_admin_commands                           20                        
-Com_change_db                              1000                        
-Com_delete                                 8000                        
-Com_insert                                 8000                        
-Com_lock_tables                             200                        
-Com_replace                                1250                        
-Com_select                                22500                        
-Com_set_option                            22500                        
-Com_show_binlogs                             10                        
-Com_show_create_db                          400                        
-Com_show_create_table                      7000                        
-Com_show_databases                          125                        
-Com_show_fields                            7000                        
-Com_show_innodb_status                      300                        
-Com_show_open_tables                         10                        
-Com_show_processlist                        300                        
-Com_show_slave_status                       300                        
-Com_show_status                             350                        
-Com_show_storage_engines                     10                        
-Com_show_tables                             400                        
-Com_show_triggers                          7000                        
-Com_show_variables                          450                        
-Com_truncate                                300                        
-Com_unlock_tables                           250                        
-Com_update                                  900                        
-Connections                                2500                        
-Created_tmp_disk_tables                   15000                        
-Created_tmp_files                            60                        
-Created_tmp_tables                        22500                        
-Flush_commands                               10                        
-Handler_delete                             8000                        
-Handler_read_first                         2250                        
-Handler_read_key                          30000                        
-Handler_read_next                         15000                        
-Handler_read_rnd                           9000                        
-Handler_read_rnd_next                    300000           3            
-Handler_update                            17500                        
-Handler_write                            250000           2            
-Innodb_buffer_pool_pages_data               225                        
-Innodb_buffer_pool_pages_free              5000                        
-Innodb_buffer_pool_pages_total             6000                        
-Innodb_buffer_pool_read_ahead_rnd            10                        
-Innodb_buffer_pool_read_requests           2250                        
-Innodb_buffer_pool_reads                    150                        
-Innodb_data_fsyncs                           35                        
-Innodb_data_read                       30000000         350            
-Innodb_data_reads                           300                        
-Innodb_data_writes                           35                        
-Innodb_data_written                       17500                        
-Innodb_log_writes                            10                        
-Innodb_os_log_fsyncs                         35                        
-Innodb_os_log_written                      6000                        
-Innodb_page_size                         175000           2            
-Innodb_pages_read                           225                        
-Key_blocks_unused                        150000           1            
-Key_blocks_used                             175                        
-Key_read_requests                        100000           1            
-Key_reads                                   600                        
-Key_write_requests                        70000                        
-Key_writes                                17500                        
-Max_used_connections                         45                        
-Open_files                                 1500                        
-Open_tables                                 700                        
-Opened_tables                             15000                        
-Qcache_free_blocks                           80                        
-Qcache_free_memory                    175000000        2250            
-Qcache_hits                                8000                        
-Qcache_inserts                            20000                        
-Qcache_not_cached                         10000                        
-Qcache_queries_in_cache                     225                        
-Qcache_total_blocks                         600                        
-Questions                                100000           1            
-Select_scan                               25000                        
-Sort_rows                                  8000                        
-Sort_scan                                   300                        
-Table_locks_immediate                     50000                   17500
-Table_locks_waited                           10                       1
-Threads_cached                               35                        
-Threads_connected                            10                        
-Threads_created                              45                        
-Threads_running                              10                        
-Uptime                                    90000           1           1
-Uptime_since_flush_status                 90000           1            
-EOF
-
-join samples/mysql-status-00{1,2}.txt > /tmp/percona-toolkit
 
=== added file 't/pt-mysql-summary/format_status_variables.sh'
--- t/pt-mysql-summary/format_status_variables.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/format_status_variables.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,96 @@
+#!/bin/bash
+
+TESTS=1
+
+cat <<EOF > $TMPDIR/expected
+Variable                                Per day  Per second      5 secs
+Bytes_received                          8000000         100            
+Bytes_sent                             35000000         400            
+Com_admin_commands                           20                        
+Com_change_db                              1000                        
+Com_delete                                 8000                        
+Com_insert                                 8000                        
+Com_lock_tables                             200                        
+Com_replace                                1250                        
+Com_select                                22500                        
+Com_set_option                            22500                        
+Com_show_binlogs                             10                        
+Com_show_create_db                          400                        
+Com_show_create_table                      7000                        
+Com_show_databases                          125                        
+Com_show_fields                            7000                        
+Com_show_innodb_status                      300                        
+Com_show_open_tables                         10                        
+Com_show_processlist                        300                        
+Com_show_slave_status                       300                        
+Com_show_status                             350                        
+Com_show_storage_engines                     10                        
+Com_show_tables                             400                        
+Com_show_triggers                          7000                        
+Com_show_variables                          450                        
+Com_truncate                                300                        
+Com_unlock_tables                           250                        
+Com_update                                  900                        
+Connections                                2500                        
+Created_tmp_disk_tables                   15000                        
+Created_tmp_files                            60                        
+Created_tmp_tables                        22500                        
+Flush_commands                               10                        
+Handler_delete                             8000                        
+Handler_read_first                         2250                        
+Handler_read_key                          30000                        
+Handler_read_next                         15000                        
+Handler_read_rnd                           9000                        
+Handler_read_rnd_next                    300000           3            
+Handler_update                            17500                        
+Handler_write                            250000           2            
+Innodb_buffer_pool_pages_data               225                        
+Innodb_buffer_pool_pages_free              5000                        
+Innodb_buffer_pool_pages_total             6000                        
+Innodb_buffer_pool_read_ahead_rnd            10                        
+Innodb_buffer_pool_read_requests           2250                        
+Innodb_buffer_pool_reads                    150                        
+Innodb_data_fsyncs                           35                        
+Innodb_data_read                       30000000         350            
+Innodb_data_reads                           300                        
+Innodb_data_writes                           35                        
+Innodb_data_written                       17500                        
+Innodb_log_writes                            10                        
+Innodb_os_log_fsyncs                         35                        
+Innodb_os_log_written                      6000                        
+Innodb_page_size                         175000           2            
+Innodb_pages_read                           225                        
+Key_blocks_unused                        150000           1            
+Key_blocks_used                             175                        
+Key_read_requests                        100000           1            
+Key_reads                                   600                        
+Key_write_requests                        70000                        
+Key_writes                                17500                        
+Max_used_connections                         45                        
+Open_files                                 1500                        
+Open_tables                                 700                        
+Opened_tables                             15000                        
+Qcache_free_blocks                           80                        
+Qcache_free_memory                    175000000        2250            
+Qcache_hits                                8000                        
+Qcache_inserts                            20000                        
+Qcache_not_cached                         10000                        
+Qcache_queries_in_cache                     225                        
+Qcache_total_blocks                         600                        
+Questions                                100000           1            
+Select_scan                               25000                        
+Sort_rows                                  8000                        
+Sort_scan                                   300                        
+Table_locks_immediate                     50000                   17500
+Table_locks_waited                           10                       1
+Threads_cached                               35                        
+Threads_connected                            10                        
+Threads_created                              45                        
+Threads_running                              10                        
+Uptime                                    90000           1           1
+Uptime_since_flush_status                 90000           1            
+EOF
+
+join samples/mysql-status-00{1,2}.txt > $TMPDIR/in
+format_status_variables $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== removed file 't/pt-mysql-summary/fuzz-01'
--- t/pt-mysql-summary/fuzz-01	2011-07-01 16:29:50 +0000
+++ t/pt-mysql-summary/fuzz-01	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-#fuzz 49
-
-cat <<EOF > $1
-50
-EOF
 
=== added file 't/pt-mysql-summary/fuzz.sh'
--- t/pt-mysql-summary/fuzz.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/fuzz.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+TESTS=1
+
+TEST_NAME="fuzz 49"
+is $(fuzz 49) "50"
 
=== removed file 't/pt-mysql-summary/get-mysql-tz'
--- t/pt-mysql-summary/get-mysql-tz	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/get-mysql-tz	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-#!/bin/bash
-#get_mysql_timezone
-
-echo EDT > $1
-
-cp samples/mysql-variables-001.txt /tmp/percona-toolkit-mysql-variables
 
=== removed file 't/pt-mysql-summary/get-mysql-uptime'
--- t/pt-mysql-summary/get-mysql-uptime	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/get-mysql-uptime	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash
-#get_mysql_uptime
-
-cat <<EOF > $1
-2010-05-27 11:38 (up 0+02:08:52)
-EOF
-
-cp samples/mysql-status-001.txt /tmp/percona-toolkit-mysql-status
-echo "2010-05-27 11:38" > /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/get-mysql-version'
--- t/pt-mysql-summary/get-mysql-version	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/get-mysql-version	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash
-#get_mysql_version
-
-cat <<EOF > $1
-             Version | 5.0.51a-24+lenny2 (Debian)
-            Built On | debian-linux-gnu i486
-EOF
-
-cp samples/mysql-variables-001.txt /tmp/percona-toolkit-mysql-variables
 
=== added file 't/pt-mysql-summary/get_mysql_info.sh'
--- t/pt-mysql-summary/get_mysql_info.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/get_mysql_info.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+TESTS=3
+
+TEST_NAME="get_mysql_timezone"
+cp samples/mysql-variables-001.txt /tmp/percona-toolkit-mysql-variables
+is $(get_mysql_timezone) "EDT"
+
+TEST_NAME="get_mysql_uptime"
+cat <<EOF > $TMPDIR/expected
[phone]:38 (up 0+02:08:52)
+EOF
+cp samples/mysql-status-001.txt /tmp/percona-toolkit-mysql-status
+echo "2010-05-27 11:38" > $TMPDIR/in
+get_mysql_uptime $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+TEST_NAME="get_mysql_version"
+cat <<EOF > $TMPDIR/expected
+             Version | 5.0.51a-24+lenny2 (Debian)
+            Built On | debian-linux-gnu i486
+EOF
+cp samples/mysql-variables-001.txt /tmp/percona-toolkit-mysql-variables
+get_mysql_version > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== removed file 't/pt-mysql-summary/overall_db_stats-01'
--- t/pt-mysql-summary/overall_db_stats-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/overall_db_stats-01	1970-01-01 00:00:00 +0000
@@ -1,33 +0,0 @@
-#!/bin/bash
-#format_overall_db_stats
-
-cat <<EOF > $1
-
-  Database Tables Views SPs Trigs Funcs   FKs Partn
-  mysql        17                                  
-  sakila       17     7   3     6     3    22     1
-
-  Database MyISAM InnoDB
-  mysql        17       
-  sakila        2     15
-
-  Database BTREE FULLTEXT
-  mysql       24         
-  sakila      63        1
-
-             c   t   s   e   t   s   i   t   b   l   b   v   d   y   d   m
-             h   i   e   n   i   m   n   e   l   o   i   a   a   e   e   e
-             a   m   t   u   n   a   t   x   o   n   g   r   t   a   c   d
-             r   e       m   y   l       t   b   g   i   c   e   r   i   i
-                 s           i   l               b   n   h   t       m   u
-                 t           n   i               l   t   a   i       a   m
-                 a           t   n               o       r   m       l   i
-                 m               t               b           e           n
-                 p                                                       t
-  Database === === === === === === === === === === === === === === === ===
-  mysql     38   5   5  69   2   3  16   2   4   1   2                    
-  sakila     1  15   1   3  19  26   3   4   1          45   4   1   7   2
-
-EOF
-
-cp samples/mysql-schema-001.txt /tmp/percona-toolkit-mysqldump
 
=== removed file 't/pt-mysql-summary/overall_db_stats-02'
--- t/pt-mysql-summary/overall_db_stats-02	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/overall_db_stats-02	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/bin/bash
-#format_overall_db_stats
-
-cat <<EOF > $1
-
-  Database Tables Views SPs Trigs Funcs   FKs Partn
-  {chosen}      1                                  
-
-  Database InnoDB
-  {chosen}      1
-
-  Database BTREE
-  {chosen}     2
-
-             t   v
-             i   a
-             n   r
-             y   c
-             i   h
-             n   a
-             t   r
-  Database === ===
-  {chosen}   1   1
-
-EOF
-
-cp samples/mysql-schema-002.txt /tmp/percona-toolkit-mysqldump
 
=== removed file 't/pt-mysql-summary/parse-master-status-01'
--- t/pt-mysql-summary/parse-master-status-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/parse-master-status-01	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash
-#format_binlog_filters
-
-cat <<EOF > $1
-        binlog_do_db | foo
-    binlog_ignore_db | mysql,test
-EOF
-
-cp samples/mysql-show-master-status-001.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/parse-mysqld-instances-01'
--- t/pt-mysql-summary/parse-mysqld-instances-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/parse-mysqld-instances-01	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-#parse_mysqld_instances
-
-cat <<EOF > $1
-  Port  Data Directory             Socket
-  ===== ========================== ======
-   3306 /var/lib/mysql             /var/run/mysqld/mysqld.sock
-  12345 /tmp/12345/data            /tmp/12345/mysql_sandbox12345.sock
-  12346 /tmp/12346/data            /tmp/12346/mysql_sandbox12346.sock
-EOF
-
-cp samples/ps-mysqld-001.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/parse-mysqld-instances-02'
--- t/pt-mysql-summary/parse-mysqld-instances-02	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/parse-mysqld-instances-02	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-#parse_mysqld_instances
-
-cat <<EOF > $1
-  Port  Data Directory             Socket
-  ===== ========================== ======
-        /var/lib/mysql             /var/lib/mysql/mysql.sock
-EOF
-
-cp samples/ps-mysqld-002.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/parse-mysqld-instances-03'
--- t/pt-mysql-summary/parse-mysqld-instances-03	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/parse-mysqld-instances-03	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-#parse_mysqld_instances
-
-cat <<EOF > $1
-  Port  Data Directory             Socket
-  ===== ========================== ======
-   3306 /mnt/data-store/mysql/data /tmp/mysql.sock
-EOF
-
-cp samples/ps-mysqld-003.txt /tmp/percona-toolkit
 
=== removed file 't/pt-mysql-summary/parse-mysqld-instances-04'
--- t/pt-mysql-summary/parse-mysqld-instances-04	2011-07-01 16:29:50 +0000
+++ t/pt-mysql-summary/parse-mysqld-instances-04	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-#parse_mysqld_instances
-
-cat <<EOF > $1
-  Port  Data Directory             Socket
-  ===== ========================== ======
-        /var/db/mysql              
-EOF
-
-cat <<EOF > $2
-mysql   767  0.0  0.9  3492  1100  v0  I     3:01PM   0:00.07 /bin/sh /usr/local/bin/mysqld_safe --defaults-extra-file=/var/db/mysql/my.cnf --user=mysql --datadir=/var/db/mysql --pid-file=/var/db/mysql/freebsd.hsd1.va.comcast.net..pid
-mysql   818  0.0 17.4 45292 20584  v0  I     3:01PM   0:02.28 /usr/local/libexec/mysqld --defaults-extra-file=/var/db/mysql/my.cnf --basedir=/usr/local --datadir=/var/db/mysql --user=mysql --log-error=/var/db/mysql/freebsd.hsd1.va.comcast.net..err --pid-file=/var/db/mysql/freebsd.hsd1.va.comcast.net..pid
-EOF
 
=== removed file 't/pt-mysql-summary/parse-processlist-01'
--- t/pt-mysql-summary/parse-processlist-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/parse-processlist-01	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-#!/bin/bash
-#summarize_processlist
-
-cat <<EOF > $1
-
-  Command                        COUNT(*) Working SUM(Time) MAX(Time)
-  ------------------------------ -------- ------- --------- ---------
-  Binlog Dump                           1       1   9000000   9000000
-  Connect                               2       2   6000000   5000000
-  Query                                 2       2         0         0
-  Sleep                               150       0    150000     20000
-
-  User                           COUNT(*) Working SUM(Time) MAX(Time)
-  ------------------------------ -------- ------- --------- ---------
-  acjcxx                                4       0         0         0
-  aecac                                 1       0         0         0
-  babeecc                              20       0         0         0
-  centous                               2       0         0         0
-  crcpcpc                               2       0         0         0
-  crgcp4c                               3       0         0         0
-  eanecj                               30       1         0         0
-  ebace                                10       0         0         0
-  etace                                80       0         0         0
-  goate                                 8       0         0         0
-  qjveec                                1       0         0         0
-  repl                                  1       1   9000000   9000000
-  root                                  1       1         0         0
-  system user                           2       2   6000000   5000000
-
-  Host                           COUNT(*) Working SUM(Time) MAX(Time)
-  ------------------------------ -------- ------- --------- ---------
-  10.14.82.196                          6       0         0         0
-  10.14.82.202                         20       0         0         0
-  10.17.85.100                          9       0         0         0
-  10.17.85.74                           1       1   9000000   9000000
-  10.17.85.86                          35       0         0         0
-  10.17.85.88                           5       0         0         0
-  10.17.85.90                          10       0         0         0
-  10.36.34.66                          35       1         0         0
-                                        2       2   6000000   5000000
-  localhost                             1       1         0         0
-  someserver.woozle.com11               1       0         0         0
-  someserver.woozle.com14               1       0         0         0
-  someserver.woozle.com                40       0         0         0
-
-  db                             COUNT(*) Working SUM(Time) MAX(Time)
-  ------------------------------ -------- ------- --------- ---------
-  aetecjc                             175       1         0         0
-  NULL                                  4       4  15000000   9000000
-
-  State                          COUNT(*) Working SUM(Time) MAX(Time)
-  ------------------------------ -------- ------- --------- ---------
-                                      150       0         0         0
-  Has read all relay log; waitin        1       1    300000    300000
-  Has sent all binlog to slave;         1       1   9000000   9000000
-  NULL                                  2       2         0         0
-  Waiting for master to send eve        1       1   5000000   5000000
-
-EOF
-
-cp samples/processlist-001.txt /tmp/percona-toolkit-mysql-processlist
 
=== added file 't/pt-mysql-summary/parse_mysqld_instances.sh'
--- t/pt-mysql-summary/parse_mysqld_instances.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/parse_mysqld_instances.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+TESTS=4
+
+TEST_NAME="ps-mysqld-001.txt"
+cat <<EOF > $TMPDIR/expected
+  Port  Data Directory             Socket
+  ===== ========================== ======
+   3306 /var/lib/mysql             /var/run/mysqld/mysqld.sock
+  12345 /tmp/12345/data            /tmp/12345/mysql_sandbox12345.sock
+  12346 /tmp/12346/data            /tmp/12346/mysql_sandbox12346.sock
+EOF
+parse_mysqld_instances samples/ps-mysqld-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+TEST_NAME="ps-mysqld-002.txt"
+cat <<EOF > $TMPDIR/expected
+  Port  Data Directory             Socket
+  ===== ========================== ======
+        /var/lib/mysql             /var/lib/mysql/mysql.sock
+EOF
+parse_mysqld_instances samples/ps-mysqld-002.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+TEST_NAME="ps-mysqld-003.txt"
+#parse_mysqld_instances
+cat <<EOF > $TMPDIR/expected
+  Port  Data Directory             Socket
+  ===== ========================== ======
+   3306 /mnt/data-store/mysql/data /tmp/mysql.sock
+EOF
+parse_mysqld_instances samples/ps-mysqld-003.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+cat <<EOF > $TMPDIR/expected
+  Port  Data Directory             Socket
+  ===== ========================== ======
+        /var/db/mysql              
+EOF
+
+cat <<EOF > $TMPDIR/in
+mysql   767  0.0  0.9  3492  1100  v0  I     3:01PM   0:00.07 /bin/sh /usr/local/bin/mysqld_safe --defaults-extra-file=/var/db/mysql/my.cnf --user=mysql --datadir=/var/db/mysql --pid-file=/var/db/mysql/freebsd.hsd1.va.comcast.net..pid
+mysql   818  0.0 17.4 45292 20584  v0  I     3:01PM   0:02.28 /usr/local/libexec/mysqld --defaults-extra-file=/var/db/mysql/my.cnf --basedir=/usr/local --datadir=/var/db/mysql --user=mysql --log-error=/var/db/mysql/freebsd.hsd1.va.comcast.net..err --pid-file=/var/db/mysql/freebsd.hsd1.va.comcast.net..pid
+EOF
+parse_mysqld_instances $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== removed file 't/pt-mysql-summary/pretty-print-my-cnf-01'
--- t/pt-mysql-summary/pretty-print-my-cnf-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/pretty-print-my-cnf-01	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/bin/bash
-#pretty_print_cnf_file
-
-cat <<EOF > $1
-
-[mysqld]
-datadir                             = /mnt/data/mysql
-socket                              = /mnt/data/mysql/mysql.sock
-old_passwords                       = 1
-ssl-key                             = /opt/mysql.pdns/.cert/server-key.pem
-ssl-cert                            = /opt/mysql.pdns/.cert/server-cert.pem
-ssl-ca                              = /opt/mysql.pdns/.cert/ca-cert.pem
-innodb_buffer_pool_size             = 16M
-innodb_flush_method                 = O_DIRECT
-innodb_log_file_size                = 64M
-innodb_log_buffer_size              = 1M
-innodb_flush_log_at_trx_commit      = 2
-innodb_file_per_table               = 1
-ssl                                 = 1
-server-id                           = 1
-log-bin                             = sl1-bin
-
-[mysql.server]
-user                                = mysql
-basedir                             = /mnt/data
-
-[mysqld_safe]
-log-error                           = /var/log/mysqld.log
-pid-file                            = /var/run/mysqld/mysqld.pid
-
-[mysql]
-
-[xtrabackup]
-target-dir                          = /data/backup
-EOF
-
-cp samples/my.cnf-001.txt /tmp/percona-toolkit
 
=== added file 't/pt-mysql-summary/pretty_print_cnf_file.sh'
--- t/pt-mysql-summary/pretty_print_cnf_file.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/pretty_print_cnf_file.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+TESTS=1
+
+cat <<EOF > $TMPDIR/expected
+
+[mysqld]
+datadir                             = /mnt/data/mysql
+socket                              = /mnt/data/mysql/mysql.sock
+old_passwords                       = 1
+ssl-key                             = /opt/mysql.pdns/.cert/server-key.pem
+ssl-cert                            = /opt/mysql.pdns/.cert/server-cert.pem
+ssl-ca                              = /opt/mysql.pdns/.cert/ca-cert.pem
+innodb_buffer_pool_size             = 16M
+innodb_flush_method                 = O_DIRECT
+innodb_log_file_size                = 64M
+innodb_log_buffer_size              = 1M
+innodb_flush_log_at_trx_commit      = 2
+innodb_file_per_table               = 1
+ssl                                 = 1
+server-id                           = 1
+log-bin                             = sl1-bin
+
+[mysql.server]
+user                                = mysql
+basedir                             = /mnt/data
+
+[mysqld_safe]
+log-error                           = /var/log/mysqld.log
+pid-file                            = /var/run/mysqld/mysqld.pid
+
+[mysql]
+
+[xtrabackup]
+target-dir                          = /data/backup
+EOF
+
+pretty_print_cnf_file samples/my.cnf-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== modified file 't/pt-mysql-summary/pt-mysql-summary.t'
--- t/pt-mysql-summary/pt-mysql-summary.t	2011-07-12 22:56:55 +0000
+++ t/pt-mysql-summary/pt-mysql-summary.t	2011-08-19 17:39:24 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/evn perl
+#!/usr/bin/env perl
 
 BEGIN {
    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@
 
 use PerconaTest;
 
-system("$trunk/util/test-bash-tool pt-mysql-summary @ARGV");
+my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
+push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
+system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
 
 exit;
 
=== removed file 't/pt-mysql-summary/summarize-binlogs-01'
--- t/pt-mysql-summary/summarize-binlogs-01	2011-08-02 21:14:06 +0000
+++ t/pt-mysql-summary/summarize-binlogs-01	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-#summarize_binlogs
-
-cat <<EOF > $1
-             Binlogs | 20
-          Zero-Sized | 3
-          Total Size | 6.5G
-EOF
-
-cp samples/mysql-master-logs-001.txt /tmp/percona-toolkit
 
=== added file 't/pt-mysql-summary/summarize_binlogs.sh'
--- t/pt-mysql-summary/summarize_binlogs.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/summarize_binlogs.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+TESTS=1
+
+cat <<EOF > $TMPDIR/expected
+             Binlogs | 20
+          Zero-Sized | 3
+          Total Size | 6.5G
+EOF
+
+summarize_binlogs samples/mysql-master-logs-001.txt > $TMPDIR/got
+no_diff $TMPDIR/expected $TMPDIR/got
 
=== added file 't/pt-mysql-summary/summarize_processlist.sh'
--- t/pt-mysql-summary/summarize_processlist.sh	1970-01-01 00:00:00 +0000
+++ t/pt-mysql-summary/summarize_processlist.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,63 @@
+#!/bin/bash
+
+TESTS=1
+
+cat <<EOF > $TMPDIR/expected
+
+  Command                        COUNT(*) Working SUM(Time) MAX(Time)
+  ------------------------------ -------- ------- --------- ---------
+  Binlog Dump                           1       1   9000000   9000000
+  Connect                               2       2   6000000   5000000
+  Query                                 2       2         0         0
+  Sleep                               150       0    150000     20000
+
+  User                           COUNT(*) Working SUM(Time) MAX(Time)
+  ------------------------------ -------- ------- --------- ---------
+  acjcxx                                4       0         0         0
+  aecac                                 1       0         0         0
+  babeecc                              20       0         0         0
+  centous                               2       0         0         0
+  crcpcpc                               2       0         0         0
+  crgcp4c                               3       0         0         0
+  eanecj                               30       1         0         0
+  ebace                                10       0         0         0
+  etace                                80       0         0         0
+  goate                                 8       0         0         0
+  qjveec                                1       0         0         0
+  repl                                  1       1   9000000   9000000
+  root                                  1       1         0         0
+  system user                           2       2   6000000   5000000
+
+  Host                           COUNT(*) Working SUM(Time) MAX(Time)
+  ------------------------------ -------- ------- --------- ---------
+  10.14.82.196                          6       0         0         0
+  10.14.82.202                         20       0         0         0
+  10.17.85.100                          9       0         0         0
+  10.17.85.74                           1       1   9000000   9000000
+  10.17.85.86                          35       0         0         0
+  10.17.85.88                           5       0         0         0
+  10.17.85.90                          10       0         0         0
+  10.36.34.66                          35       1         0         0
+                                        2       2   6000000   5000000
+  localhost                             1       1         0         0
+  someserver.woozle.com11               1       0         0         0
+  someserver.woozle.com14               1       0         0         0
+  someserver.woozle.com                40       0         0         0
+
+  db                             COUNT(*) Working SUM(Time) MAX(Time)
+  ------------------------------ -------- ------- --------- ---------
+  aetecjc                             175       1         0         0
+  NULL                                  4       4  15000000   9000000
+
+  State                          COUNT(*) Working SUM(Time) MAX(Time)
+  ------------------------------ -------- ------- --------- ---------
+                                      150       0         0         0
+  Has read all relay log; waitin        1       1    300000    300000
+  Has sent all binlog to slave;         1       1   9000000   9000000
+  NULL                                  2       2         0         0
+  Waiting for master to send eve        1       1   5000000   5000000
+
+EOF
+
+summarize_processlist samples/processlist-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== removed file 't/pt-pmp/aggregate-stacktrace-01'
--- t/pt-pmp/aggregate-stacktrace-01	2011-08-02 21:14:06 +0000
+++ t/pt-pmp/aggregate-stacktrace-01	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#!/bin/bash
-#aggregate_stacktrace 0 /tmp/percona-toolkit
-
-cat > $1 <<EOF
-    187 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,open_table,open_tables,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-     62 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,close_thread_tables,dispatch_command,handle_one_connection,start_thread,clone
-     39 read,vio_read,my_real_read,my_net_read,handle_one_connection,start_thread,clone
-     18 pthread_cond_wait,safe_cond_wait,os_event_wait_low,os_aio_simulated_handle,fil_aio_wait,io_handler_thread,start_thread,clone
-     15 pthread_cond_wait,safe_cond_wait,end_thread,handle_one_connection,start_thread,clone
-     15 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,open_table,open_tables,mysql_update,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-     12 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,open_table,open_tables,open_and_lock_tables,mysql_insert,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      2 __lll_mutex_lock_wait,_L_mutex_lock_107,pthread_mutex_lock,safe_mutex_lock,Log_event::read_log_event,mysql_binlog_send,dispatch_command,handle_one_connection,start_thread,clone
-      1 select,os_thread_sleep,srv_master_thread,start_thread,clone
-      1 select,os_thread_sleep,srv_lock_timeout_and_monitor_thread,start_thread,clone
-      1 select,os_thread_sleep,srv_error_monitor_thread,start_thread,clone
-      1 select,handle_connections_sockets,main
-      1 _sanity,_myfree,st_join_table::cleanup,JOIN::cleanup,JOIN::join_free,do_select,JOIN::exec,mysql_select,handle_select,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 pread64,_os_file_pread,_os_file_read,_fil_io,buf_read_page_low,buf_read_page,buf_page_get_gen,btr_cur_search_to_nth_level,btr_estimate_n_rows_in_range,ha_innobase::records_in_range,check_quick_keys,check_quick_select,get_key_scans_params,SQL_SELECT::test_quick_select,mysql_update,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_sanity,_myrealloc,String::realloc,String::append,Log_event::read_log_event,mysql_binlog_send,dispatch_command,handle_one_connection,start_thread,clone
-      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_sanity,_mymalloc,_myrealloc,mi_alloc_rec_buff,mi_open,ha_myisam::open,handler::ha_open,open_tmp_table,create_tmp_table,select_union::create_result_table,mysql_derived_prepare,mysql_handle_derived,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_sanity,_mymalloc,init_dynamic_array,QUICK_RANGE_SELECT,get_quick_select,TRP_RANGE::make_quick,SQL_SELECT::test_quick_select,make_join_statistics,JOIN::optimize,mysql_select,mysql_derived_filling,mysql_handle_derived,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_mymalloc,alloc_root,MYSQLparse,mysql_make_view,open_unireg_entry,open_table,open_tables,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 __lll_mutex_lock_wait,_L_mutex_lock_107,pthread_mutex_lock,safe_mutex_lock,mi_open,ha_myisam::open,handler::ha_open,open_tmp_table,create_tmp_table,select_union::create_result_table,mysql_derived_prepare,mysql_handle_derived,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 do_sigwait,sigwait,signal_hand,start_thread,clone
-EOF
-
-cp samples/stacktrace-001.txt $2
 
=== removed file 't/pt-pmp/aggregate-stacktrace-02'
--- t/pt-pmp/aggregate-stacktrace-02	2011-08-02 21:14:06 +0000
+++ t/pt-pmp/aggregate-stacktrace-02	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-#aggregate_stacktrace 0 /tmp/percona-toolkit
-
-cat > $1 <<EOF
-   2387 pthread_cond_wait,open_table,open_tables,open_and_lock_tables_derived,execute_sqlcom_select,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
-      5 pthread_cond_wait,open_table,open_tables,open_and_lock_tables_derived,mysql_insert,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
-      4 pthread_cond_wait,os_event_wait_low,os_aio_simulated_handle,fil_aio_wait,io_handler_thread,start_thread,clone
-      4 pthread_cond_wait,open_table,open_tables,open_and_lock_tables_derived,mysql_delete,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
-      1 select,os_thread_sleep,srv_master_thread,start_thread,clone
-      1 select,os_thread_sleep,srv_lock_timeout_and_monitor_thread,start_thread,clone
-      1 select,os_thread_sleep,srv_error_monitor_thread,start_thread,clone
-      1 select,handle_connections_sockets,main,select
-      1 read,my_real_read,my_net_read,do_command,handle_one_connection,start_thread,clone
-      1 pthread_cond_wait,cache_thread,one_thread_per_connection_end,handle_one_connection,start_thread,clone
-      1 free,ut_free,page_cur_insert_rec_low,btr_cur_optimistic_insert,row_ins_index_entry_low,row_ins_index_entry,row_ins,row_ins_step,row_insert_for_mysql,ha_innobase::write_row,handler::ha_write_row,ha_partition::copy_partitions,ha_partition::change_partitions,handler::ha_change_partitions,mysql_change_partitions,fast_alter_partition_table,mysql_alter_table,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
-      1 do_sigwait,sigwait,signal_hand,start_thread,clone
-EOF
-
-cp samples/stacktrace-002.txt $2
 
=== removed file 't/pt-pmp/aggregate-stacktrace-03'
--- t/pt-pmp/aggregate-stacktrace-03	2011-08-02 21:14:06 +0000
+++ t/pt-pmp/aggregate-stacktrace-03	1970-01-01 00:00:00 +0000
@@ -1,18 +0,0 @@
-#!/bin/bash
-#aggregate_stacktrace 0 /tmp/percona-toolkit
-
-cat > $1 <<EOF
-     35 pthread_cond_wait,end_thread,handle_one_connection,start_thread,clone
-     20 read,read,vio_read,my_real_read,my_net_read,handle_one_connection,start_thread,clone
-     18 pthread_cond_wait,os_event_wait_low,os_aio_simulated_handle,fil_aio_wait,io_handler_thread,start_thread,clone
-      3 pthread_cond_wait,MYSQL_LOG::wait_for_update,mysql_binlog_send,dispatch_command,handle_one_connection,start_thread,clone
-      1 select,os_thread_sleep,srv_master_thread,start_thread,clone
-      1 select,os_thread_sleep,srv_lock_timeout_and_monitor_thread,start_thread,clone
-      1 select,os_thread_sleep,srv_error_monitor_thread,start_thread,clone
-      1 select,handle_connections_sockets,main
-      1 do_sigwait,sigwait,signal_hand,start_thread,clone
-      1 btr_search_guess_on_hash,btr_cur_search_to_nth_level,btr_pcur_open_with_no_init,row_search_for_mysql,ha_innobase::index_read,join_read_always_key,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,do_select,JOIN::exec,mysql_select,handle_select,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-      1 btr_cur_search_to_nth_level,btr_estimate_n_rows_in_range,ha_innobase::records_in_range,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_select,get_key_scans_params,SQL_SELECT::test_quick_select,get_quick_record_count,make_join_statistics,JOIN::optimize,mysql_select,handle_select,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
-EOF
-
-cp samples/stacktrace-003.txt $2
 
=== removed file 't/pt-pmp/aggregate-stacktrace-03-b'
--- t/pt-pmp/aggregate-stacktrace-03-b	2011-08-02 21:14:06 +0000
+++ t/pt-pmp/aggregate-stacktrace-03-b	1970-01-01 00:00:00 +0000
@@ -1,16 +0,0 @@
-#!/bin/bash
-#aggregate_stacktrace 2 /tmp/percona-toolkit
-
-cat > $1 <<EOF
-     35 pthread_cond_wait,end_thread
-     20 read,read
-     18 pthread_cond_wait,os_event_wait_low
-      3 select,os_thread_sleep
-      3 pthread_cond_wait,MYSQL_LOG::wait_for_update
-      1 select,handle_connections_sockets
-      1 do_sigwait,sigwait
-      1 btr_search_guess_on_hash,btr_cur_search_to_nth_level
-      1 btr_cur_search_to_nth_level,btr_estimate_n_rows_in_range
-EOF
-
-cp samples/stacktrace-003.txt $2
 
=== removed file 't/pt-pmp/aggregate-stacktrace-04'
--- t/pt-pmp/aggregate-stacktrace-04	2011-08-02 21:14:06 +0000
+++ t/pt-pmp/aggregate-stacktrace-04	1970-01-01 00:00:00 +0000
@@ -1,12 +0,0 @@
-#!/bin/bash
-#aggregate_stacktrace 0 /tmp/percona-toolkit
-
-cat > $1 <<EOF
-     33 pthread_cond_wait,boost::condition_variable::wait,Queue::pop,Worker::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
-      1 StringBuilder::length,Parser::add,Parser::try_parse_query,Parser::parse_block,Parser::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
-      1 pthread_cond_wait,boost::thread::join,LogReader::wait,Replay::wait,main
-      1 pthread_cond_wait,boost::condition_variable::wait,Queue::push,LogReader::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
-      1 pthread_cond_wait,boost::condition_variable::wait,Queue::pop,Reporter::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
-EOF
-
-cp samples/stacktrace-004.txt $2
 
=== removed file 't/pt-pmp/aggregate-stacktrace-05'
--- t/pt-pmp/aggregate-stacktrace-05	2011-08-02 21:14:06 +0000
+++ t/pt-pmp/aggregate-stacktrace-05	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-#aggregate_stacktrace 0 /tmp/percona-toolkit
-
-cat > $1 <<EOF
-     32 read,vio_read_buff,libmysqlclient::??,my_net_read,cli_safe_read,libmysqlclient::??,mysql_real_query,Connection::run,Worker::work,thread_proxy,start_thread,clone,??
-      1 pthread_cond_wait,LogReader::work,thread_proxy,start_thread,clone,??
-      1 pthread_cond_wait,boost::thread::join,main
-      1 pthread_cond_wait,boost::condition_variable::wait,Worker::work,thread_proxy,start_thread,clone,??
-      1 pthread_cond_wait,boost::condition_variable::wait,Reporter::work,thread_proxy,start_thread,clone,??
-      1 pthread_cond_wait,boost::condition_variable::wait,Queue::push,Parser::work,thread_proxy,start_thread,clone,??
-EOF
-
-cp samples/stacktrace-005.txt $2
 
=== added file 't/pt-pmp/aggregate_stacktrace.sh'
--- t/pt-pmp/aggregate_stacktrace.sh	1970-01-01 00:00:00 +0000
+++ t/pt-pmp/aggregate_stacktrace.sh	2011-08-19 17:39:24 +0000
@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+
+# This test file must be ran by util/test-bash-functions.
+
+TESTS=6
+
+# ############################################################################
+TEST_NAME="stacktrace-001.txt"
+# ############################################################################
+cat > $TMPDIR/expected <<EOF
+    187 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,open_table,open_tables,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+     62 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,close_thread_tables,dispatch_command,handle_one_connection,start_thread,clone
+     39 read,vio_read,my_real_read,my_net_read,handle_one_connection,start_thread,clone
+     18 pthread_cond_wait,safe_cond_wait,os_event_wait_low,os_aio_simulated_handle,fil_aio_wait,io_handler_thread,start_thread,clone
+     15 pthread_cond_wait,safe_cond_wait,end_thread,handle_one_connection,start_thread,clone
+     15 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,open_table,open_tables,mysql_update,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+     12 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,open_table,open_tables,open_and_lock_tables,mysql_insert,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      2 __lll_mutex_lock_wait,_L_mutex_lock_107,pthread_mutex_lock,safe_mutex_lock,Log_event::read_log_event,mysql_binlog_send,dispatch_command,handle_one_connection,start_thread,clone
+      1 select,os_thread_sleep,srv_master_thread,start_thread,clone
+      1 select,os_thread_sleep,srv_lock_timeout_and_monitor_thread,start_thread,clone
+      1 select,os_thread_sleep,srv_error_monitor_thread,start_thread,clone
+      1 select,handle_connections_sockets,main
+      1 _sanity,_myfree,st_join_table::cleanup,JOIN::cleanup,JOIN::join_free,do_select,JOIN::exec,mysql_select,handle_select,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 pread64,_os_file_pread,_os_file_read,_fil_io,buf_read_page_low,buf_read_page,buf_page_get_gen,btr_cur_search_to_nth_level,btr_estimate_n_rows_in_range,ha_innobase::records_in_range,check_quick_keys,check_quick_select,get_key_scans_params,SQL_SELECT::test_quick_select,mysql_update,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_sanity,_myrealloc,String::realloc,String::append,Log_event::read_log_event,mysql_binlog_send,dispatch_command,handle_one_connection,start_thread,clone
+      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_sanity,_mymalloc,_myrealloc,mi_alloc_rec_buff,mi_open,ha_myisam::open,handler::ha_open,open_tmp_table,create_tmp_table,select_union::create_result_table,mysql_derived_prepare,mysql_handle_derived,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_sanity,_mymalloc,init_dynamic_array,QUICK_RANGE_SELECT,get_quick_select,TRP_RANGE::make_quick,SQL_SELECT::test_quick_select,make_join_statistics,JOIN::optimize,mysql_select,mysql_derived_filling,mysql_handle_derived,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 __lll_mutex_lock_wait,_L_mutex_lock_1133,pthread_mutex_lock,safe_mutex_lock,_mymalloc,alloc_root,MYSQLparse,mysql_make_view,open_unireg_entry,open_table,open_tables,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 __lll_mutex_lock_wait,_L_mutex_lock_107,pthread_mutex_lock,safe_mutex_lock,mi_open,ha_myisam::open,handler::ha_open,open_tmp_table,create_tmp_table,select_union::create_result_table,mysql_derived_prepare,mysql_handle_derived,open_and_lock_tables,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 do_sigwait,sigwait,signal_hand,start_thread,clone
+EOF
+
+aggregate_stacktrace 0 samples/stacktrace-001.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="stacktrace-002.txt"
+# ############################################################################
+cat > $TMPDIR/expected <<EOF
+   2387 pthread_cond_wait,open_table,open_tables,open_and_lock_tables_derived,execute_sqlcom_select,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
+      5 pthread_cond_wait,open_table,open_tables,open_and_lock_tables_derived,mysql_insert,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
+      4 pthread_cond_wait,os_event_wait_low,os_aio_simulated_handle,fil_aio_wait,io_handler_thread,start_thread,clone
+      4 pthread_cond_wait,open_table,open_tables,open_and_lock_tables_derived,mysql_delete,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
+      1 select,os_thread_sleep,srv_master_thread,start_thread,clone
+      1 select,os_thread_sleep,srv_lock_timeout_and_monitor_thread,start_thread,clone
+      1 select,os_thread_sleep,srv_error_monitor_thread,start_thread,clone
+      1 select,handle_connections_sockets,main,select
+      1 read,my_real_read,my_net_read,do_command,handle_one_connection,start_thread,clone
+      1 pthread_cond_wait,cache_thread,one_thread_per_connection_end,handle_one_connection,start_thread,clone
+      1 free,ut_free,page_cur_insert_rec_low,btr_cur_optimistic_insert,row_ins_index_entry_low,row_ins_index_entry,row_ins,row_ins_step,row_insert_for_mysql,ha_innobase::write_row,handler::ha_write_row,ha_partition::copy_partitions,ha_partition::change_partitions,handler::ha_change_partitions,mysql_change_partitions,fast_alter_partition_table,mysql_alter_table,mysql_execute_command,mysql_parse,dispatch_command,do_command,handle_one_connection,start_thread,clone
+      1 do_sigwait,sigwait,signal_hand,start_thread,clone
+EOF
+
+aggregate_stacktrace 0 samples/stacktrace-002.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="stacktrace-003.txt"
+# ############################################################################
+cat > $TMPDIR/expected <<EOF
+     35 pthread_cond_wait,end_thread,handle_one_connection,start_thread,clone
+     20 read,read,vio_read,my_real_read,my_net_read,handle_one_connection,start_thread,clone
+     18 pthread_cond_wait,os_event_wait_low,os_aio_simulated_handle,fil_aio_wait,io_handler_thread,start_thread,clone
+      3 pthread_cond_wait,MYSQL_LOG::wait_for_update,mysql_binlog_send,dispatch_command,handle_one_connection,start_thread,clone
+      1 select,os_thread_sleep,srv_master_thread,start_thread,clone
+      1 select,os_thread_sleep,srv_lock_timeout_and_monitor_thread,start_thread,clone
+      1 select,os_thread_sleep,srv_error_monitor_thread,start_thread,clone
+      1 select,handle_connections_sockets,main
+      1 do_sigwait,sigwait,signal_hand,start_thread,clone
+      1 btr_search_guess_on_hash,btr_cur_search_to_nth_level,btr_pcur_open_with_no_init,row_search_for_mysql,ha_innobase::index_read,join_read_always_key,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,evaluate_join_record,sub_select,do_select,JOIN::exec,mysql_select,handle_select,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+      1 btr_cur_search_to_nth_level,btr_estimate_n_rows_in_range,ha_innobase::records_in_range,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_keys,check_quick_select,get_key_scans_params,SQL_SELECT::test_quick_select,get_quick_record_count,make_join_statistics,JOIN::optimize,mysql_select,handle_select,mysql_execute_command,mysql_parse,dispatch_command,handle_one_connection,start_thread,clone
+EOF
+
+aggregate_stacktrace 0 samples/stacktrace-003.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="stacktrace-003-b.txt"
+# ############################################################################
+cat > $TMPDIR/expected <<EOF
+     35 pthread_cond_wait,end_thread
+     20 read,read
+     18 pthread_cond_wait,os_event_wait_low
+      3 select,os_thread_sleep
+      3 pthread_cond_wait,MYSQL_LOG::wait_for_update
+      1 select,handle_connections_sockets
+      1 do_sigwait,sigwait
+      1 btr_search_guess_on_hash,btr_cur_search_to_nth_level
+      1 btr_cur_search_to_nth_level,btr_estimate_n_rows_in_range
+EOF
+
+aggregate_stacktrace 2 samples/stacktrace-003.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="stacktrace-004.txt"
+# ############################################################################
+cat > $TMPDIR/expected <<EOF
+     33 pthread_cond_wait,boost::condition_variable::wait,Queue::pop,Worker::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
+      1 StringBuilder::length,Parser::add,Parser::try_parse_query,Parser::parse_block,Parser::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
+      1 pthread_cond_wait,boost::thread::join,LogReader::wait,Replay::wait,main
+      1 pthread_cond_wait,boost::condition_variable::wait,Queue::push,LogReader::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
+      1 pthread_cond_wait,boost::condition_variable::wait,Queue::pop,Reporter::work,boost::_mfi::mf0::operator,boost::_bi::list1::operator,boost::_bi::bind_t::operator,boost::detail::thread_data::run,thread_proxy,start_thread,clone,??
+EOF
+
+aggregate_stacktrace 0 samples/stacktrace-004.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
+
+# ############################################################################
+TEST_NAME="stacktrace-005.txt"
+# ############################################################################
+cat > $TMPDIR/expected <<EOF
+     32 read,vio_read_buff,libmysqlclient::??,my_net_read,cli_safe_read,libmysqlclient::??,mysql_real_query,Connection::run,Worker::work,thread_proxy,start_thread,clone,??
+      1 pthread_cond_wait,LogReader::work,thread_proxy,start_thread,clone,??
+      1 pthread_cond_wait,boost::thread::join,main
+      1 pthread_cond_wait,boost::condition_variable::wait,Worker::work,thread_proxy,start_thread,clone,??
+      1 pthread_cond_wait,boost::condition_variable::wait,Reporter::work,thread_proxy,start_thread,clone,??
+      1 pthread_cond_wait,boost::condition_variable::wait,Queue::push,Parser::work,thread_proxy,start_thread,clone,??
+EOF
+
+aggregate_stacktrace 0 samples/stacktrace-005.txt > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== modified file 't/pt-pmp/pt-pmp.t'
--- t/pt-pmp/pt-pmp.t	2011-07-12 22:56:55 +0000
+++ t/pt-pmp/pt-pmp.t	2011-08-19 17:39:24 +0000
@@ -1,4 +1,4 @@
-#!/usr/bin/evn perl
+#!/usr/bin/env perl
 
 BEGIN {
    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
@@ -12,6 +12,8 @@
 
 use PerconaTest;
 
-system("$trunk/util/test-bash-tool pt-pmp @ARGV");
+my ($tool) = $PROGRAM_NAME =~ m/([\w-]+)\.t$/;
+push @ARGV, "$trunk/t/$tool/*.sh" unless @ARGV;
+system("$trunk/util/test-bash-functions $trunk/bin/$tool @ARGV");
 
 exit;
 
=== removed file 't/pt-summary/format-filesystems-01'
--- t/pt-summary/format-filesystems-01	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format-filesystems-01	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash
-#parse_filesystems samples/df-mount-001.txt Linux
-
-cat <<EOF > $1
-  Filesystem                     Size Used Type  Opts Mountpoint
-  /dev/mapper/vg_ginger-lv_root  454G   6% ext4  rw   /
-  /dev/sda1                      194M  31% ext4  rw   /boot
-  tmpfs                          2.0G   1% tmpfs rw   /dev/shm
-EOF
 
=== removed file 't/pt-summary/format-filesystems-02'
--- t/pt-summary/format-filesystems-02	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format-filesystems-02	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
-#!/bin/bash
-#parse_filesystems samples/df-mount-002.txt Linux
-
-cat <<EOF > $1
-  Filesystem                          Size Used Type  Opts Mountpoint
-  /dev/mapper/VolGroup00-LogVol00      62G  56% ext3  rw   /
-  /dev/mapper/VolGroup01-MySQLData00   67G  20% ext3  rw   /var/lib/mysql
-  /dev/sda3                           190M  11% ext3  rw   /boot
-  tmpfs                               7.9G   0% tmpfs rw   /dev/shm
-EOF
 
=== removed file 't/pt-summary/format-filesystems-03'
--- t/pt-summary/format-filesystems-03	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format-filesystems-03	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/bash
-#parse_filesystems samples/df-mount-003.txt Linux
-
-cat <<EOF > $1
-  Filesystem  Size Used Type  Opts Mountpoint
-  /dev/sda1    99M  13% ext3  rw   /boot
-  /dev/sda2   540G  89% ext3  rw   /
-  tmpfs        48G   0% tmpfs rw   /dev/shm
-EOF
 
=== removed file 't/pt-summary/format-filesystems-04'
--- t/pt-summary/format-filesystems-04	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format-filesystems-04	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-#parse_filesystems samples/df-mount-004.txt Linux
-
-cat <<EOF > $1
-  Filesystem  Size Used Type        Opts              Mountpoint
-  /dev/sda1   9.9G  34% ext3        rw                /
-  /dev/sdb    414G   1% ext3        rw                /mnt
-  none        7.6G   0% devpts      rw,gid=5,mode=620 /dev/shm
-  none        7.6G   0% tmpfs       rw                /dev/shm
-  none        7.6G   0% binfmt_misc rw                /dev/shm
-  none        7.6G   0% proc        rw                /dev/shm
-  none        7.6G   0% sysfs       rw                /dev/shm
-EOF
 
=== removed file 't/pt-summary/format-filesystems-05'
--- t/pt-summary/format-filesystems-05	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format-filesystems-05	1970-01-01 00:00:00 +0000
@@ -1,11 +0,0 @@
-#!/bin/bash
-#parse_filesystems samples/df-mount-005.txt Linux
-
-cat <<EOF > $1
-  Filesystem                         Size Used Type  Opts       Mountpoint
-  /dev/cciss/c0d0p1                   99M  24% ext3  rw         /boot
-  /dev/mapper/VolGroup00-LogVol00    194G  58% ext3  rw         /
-  /dev/mapper/VolGroup00-mysql_log   191G   4% ext3  rw         /data/mysql-log
-  /dev/mapper/VolGroup01-mysql_data 1008G  44% ext3  rw,noatime /data/mysql-data
-  tmpfs                               48G   0% tmpfs rw         /dev/shm
-EOF
 
=== removed file 't/pt-summary/format-filesystems-06'
--- t/pt-summary/format-filesystems-06	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format-filesystems-06	1970-01-01 00:00:00 +0000
@@ -1,13 +0,0 @@
-#!/bin/bash
-#parse_filesystems samples/df-mount-006.txt FreeBSD
-
-# This one is from FreeBSD.
-
-cat <<EOF > $1
-  Filesystem   Size Used Type  Opts                Mountpoint
-  /dev/ad0s1a  496M  32% ufs   local               /
-  /dev/ad0s1d  1.1G   1% ufs   local, soft-updates /var
-  /dev/ad0s1e  496M   0% ufs   local, soft-updates /tmp
-  /dev/ad0s1f   17G   9% ufs   local, soft-updates /usr
-  devfs        1.0K 100% devfs local               /dev
-EOF
 
=== renamed file 't/pt-summary/vmstat-simplify' => 't/pt-summary/format_vmstat.sh' (properties changed: +x to -x)
--- t/pt-summary/vmstat-simplify	2011-07-01 16:29:50 +0000
+++ t/pt-summary/format_vmstat.sh	2011-08-19 17:39:24 +0000
@@ -1,7 +1,21 @@
 #!/bin/bash
-#format_vmstat
-
-cat <<EOF > $1
+
+cat <<EOF > $TMPDIR/in
+procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------
+ r  b   swpd   free   buff  cache   si   so    bi    bo   in   cs us sy id wa st
+ 0  0     68 288220 372588 13534140    0    0    24   138    1    1  4  1 94  1  0
+ 1  0     68 288080 372588 13534184    0    0     0   187  721  943  3  0 96  0  0
+ 0  0     68 287708 372588 13534276    0    0     0  1058  747  992  8  3 89  0  0
+ 1  0     68 287468 372588 13534340    0    0     0  1058  552  856 15  2 84  0  0
+ 1  0     68 287460 372588 13534388    0    0     0   322  859 1014 10  3 87  0  0
+ 0  0     68 287460 372588 13534444    0    0     0   214  612  729 10  3 88  0  0
+ 0  0     68 287460 372588 13534484    0    0     0   309  553  741  0  0 99  0  0
+ 1  0     68 287460 372588 13534532    0    0     2   197  605  727  2  1 97  0  0
+ 0  0     68 287344 372588 13534596    0    0     0  1037  485  626  0  0 99  0  0
+ 0  0     68 287220 372588 13534656    0    0     0   235  875 1004  0  0 99  0  0
+EOF
+
+cat <<EOF > $TMPDIR/expected
   procs  ---swap-- -----io---- ---system---- --------cpu--------
    r  b    si   so    bi    bo     ir     cs  us  sy  il  wa  st
    0  0     0    0    25   150      1      1   4   1  94   1   0
@@ -16,17 +30,5 @@
    0  0     0    0     0   225    900   1000   0   0  99   0   0
 EOF
 
-cat <<EOF > $2
-procs -----------memory---------- ---swap-- -----io---- --system-- -----cpu------
- r  b   swpd   free   buff  cache   si   so    bi    bo   in   cs us sy id wa st
- 0  0     68 288220 372588 13534140    0    0    24   138    1    1  4  1 94  1  0
- 1  0     68 288080 372588 13534184    0    0     0   187  721  943  3  0 96  0  0
- 0  0     68 287708 372588 13534276    0    0     0  1058  747  992  8  3 89  0  0
- 1  0     68 287468 372588 13534340    0    0     0  1058  552  856 15  2 84  0  0
- 1  0     68 287460 372588 13534388    0    0     0   322  859 1014 10  3 87  0  0
- 0  0     68 287460 372588 13534444    0    0     0   214  612  729 10  3 88  0  0
- 0  0     68 287460 372588 13534484    0    0     0   309  553  741  0  0 99  0  0
- 1  0     68 287460 372588 13534532    0    0     2   197  605  727  2  1 97  0  0
- 0  0     68 287344 372588 13534596    0    0     0  1037  485  626  0  0 99  0  0
- 0  0     68 287220 372588 13534656    0    0     0   235  875 1004  0  0 99  0  0
-EOF
+format_vmstat $TMPDIR/in > $TMPDIR/got
+no_diff $TMPDIR/got $TMPDIR/expected
 
=== removed file 't/pt-summary/fusionmpt-01'
--- t/pt-summary/fusionmpt-01	2011-07-01 16:29:50 +0000
+++ t/pt-summary/fusionmpt-01	1970-01-01 00:00:00 +0000
@@ -1,19 +0,0 @@
-#!/bin/bash
-#parse_fusionmpt_lsiutil
-
-cat <<EOF > $1
-
-  /proc/mpt/ioc0    LSI Logic SAS1068E B3    MPT 105   Firmware 00192f00   IOC 0
-   B___T___L  Type       Vendor   Product          Rev      SASAddress     PhyNum
-   0   0   0  Disk       Dell     VIRTUAL DISK     1028  
-   0   2   0  Disk       Dell     VIRTUAL DISK     1028  
-   0   8   0  EnclServ   DP       BACKPLANE        1.05  510240805f4feb00     8
-  Hidden RAID Devices:
-   B___T    Device       Vendor   Product          Rev      SASAddress     PhyNum
-   0   1  PhysDisk 0     SEAGATE  ST373455SS       S52A  5000c50012a8ac61     1
-   0   9  PhysDisk 1     SEAGATE  ST373455SS       S52A  5000c50012a8a24d     0
-   0   3  PhysDisk 2     SEAGATE  ST3146855SS      S52A  5000c500130fcaed     3
-   0  10  PhysDisk 3     SEAGATE  ST3146855SS      S52A  5000c500131093f5     2
-EOF
-
-cat samples/lsiutil-001.txt > $2
 
=== removed file 't/pt-summary/fusionmpt-02'
--- t/pt-summary/fusionmpt-02	2011-07-01 16:29:50 +0000
+++ t/pt-summary/fusionmpt-02	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/bash
-#parse_fusionmpt_lsiutil
-
-cat <<EOF > $1
-
-  /proc/mpt/ioc0    LSI Logic SAS1064E B3    MPT 105   Firmware 011e0000   IOC 0
-   B___T___L  Type       Vendor   Product          Rev      SASAddress     PhyNum
-   0   1   0  Disk       LSILOGIC Logical Volume   3000  
-  Hidden RAID Devices:
-   B___T    Device       Vendor   Product          Rev      SASAddress     PhyNum
-   0   2  PhysDisk 0     IBM-ESXS ST9300603SS   F  B536  5000c5001d784329     1
-   0   3  PhysDisk 1     IBM-ESXS MBD2300RC        SB17  500000e113c17152     0
-EOF
-
-cat samples/lsiutil-002.txt > $2
 
=== removed file 't/pt-summary/fusionmpt-03'
--- t/pt-summary/fusionmpt-03	2011-07-01 16:29:50 +0000
+++ t/pt-summary/fusionmpt-03	1970-01-01 00:00:00 +0000
@@ -1,15 +0,0 @@
-#!/bin/bash
-#parse_fusionmpt_lsiutil
-
-cat <<EOF > $1
-
-  /proc/mpt/ioc0    LSI Logic SAS1064E B3    MPT 105   Firmware 011e0000   IOC 0
-   B___T___L  Type       Vendor   Product          Rev      SASAddress     PhyNum
-   0   1   0  Disk       LSILOGIC Logical Volume   3000  
-  Hidden RAID Devices:
-   B___T    Device       Vendor   Product          Rev      SASAddress     PhyNum
-   0   2  PhysDisk 0     IBM-ESXS MBD2300RC        SB17  500000e113c00ed2     1
-   0   3  PhysDisk 1     IBM-ESXS MBD2300RC        SB17  500000e113c17ee2     0
-EOF
-
-cat samples/lsiutil-003.txt > $2
 
=== removed file 't/pt-summary/lsi-megaraid-bbu-status'
--- t/pt-summary/lsi-megaraid-bbu-status	2011-07-01 16:29:50 +0000
+++ t/pt-summary/lsi-megaraid-bbu-status	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#!/bin/bash
-#parse_lsi_megaraid_bbu_status
-
-cat <<EOF > $1
-         BBU | 100% Charged, Temperature 18C, isSOHGood=Yes
-EOF
-
-cat <<EOF > $2
-BBU status for Adapter: 0
-
-BatteryType: BBU
-Voltage: 4072 mV
-Current: 0 mA
-Temperature: 18 C
-Firmware Status: 00000000
-
-Battery state: 
-
-GasGuageStatus:
-  Fully Discharged        : No
-  Fully Charged           : Yes
-  Discharging             : Yes
-  Initialized             : Yes
-  Remaining Time Alarm    : No
-  Remaining Capacity Alarm: No
-  Discharge Terminated    : No
-  Over Temperature        : No
-  Charging Terminated     : No
-  Over Charged            : No
-
-Relative State of Charge: 100 %
-Charger Status: Complete
-Remaining Capacity: 867 mAh
-Full Charge Capacity: 867 mAh
-isSOHGood: Yes
-
-Exit Code: 0x00
-EOF
 
=== removed file 't/pt-summary/lsi-megaraid-devices-0'
--- t/pt-summary/lsi-megaraid-devices-0	2011-07-01 16:29:50 +0000
+++ t/pt-summary/lsi-megaraid-devices-0	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/bin/bash
-#parse_lsi_megaraid_devices
-
-cat <<EOF > $1
-
-  PhysiclDev Type State   Errors Vendor  Model        Size
-  ========== ==== ======= ====== ======= ============ ===========
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-EOF
-
-cat <<EOF > $2
-                                     
-Adapter #0
-
-Enclosure Device ID: 32
-Slot Number: 0
-Device Id: 0
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079f8cf9
-SAS Address(1): 0x0
-Connected Port Number: 0(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2DZ33            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-Enclosure Device ID: 32
-Slot Number: 1
-Device Id: 1
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079f5c35
-SAS Address(1): 0x0
-Connected Port Number: 1(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2D9RH            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-Enclosure Device ID: 32
-Slot Number: 2
-Device Id: 2
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079fc0c9
-SAS Address(1): 0x0
-Connected Port Number: 2(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2DPST            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-Enclosure Device ID: 32
-Slot Number: 3
-Device Id: 3
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079dc339
-SAS Address(1): 0x0
-Connected Port Number: 3(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2CKD5            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-
-Exit Code: 0x00
-EOF
 
=== removed file 't/pt-summary/lsi-megaraid-devices-1'
--- t/pt-summary/lsi-megaraid-devices-1	2011-07-01 16:29:50 +0000
+++ t/pt-summary/lsi-megaraid-devices-1	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-#!/bin/bash
-#parse_lsi_megaraid_devices
-
-cat <<EOF > $1
-
-  PhysiclDev Type State   Errors Vendor  Model        Size
-  ========== ==== ======= ====== ======= ============ ===========
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-  Hard Disk  SAS  Online   0/0/0 SEAGATE ST373455SS   70007MB
-EOF
-
-cat <<EOF > $2
-[root@pc-db1 ~]# /opt/MegaRAID/MegaCli/MegaCli64 -LdPdInfo -aALL
-                                     
-Adapter #0
-
-Number of Virtual Disks: 2
-Virtual Disk: 0 (Target Id: 0)
-Name:
-RAID Level: Primary-1, Secondary-0, RAID Level Qualifier-0
-Size:69376MB
-State: Optimal
-Stripe Size: 64kB
-Number Of Drives:2
-Span Depth:1
-Default Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Current Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Access Policy: Read/Write
-Disk Cache Policy: Disk's Default
-Number of Spans: 1
-Span: 0 - Number of PDs: 2
-PD: 0 Information
-Enclosure Device ID: 32
-Slot Number: 0
-Device Id: 0
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079f8cf9
-SAS Address(1): 0x0
-Connected Port Number: 0(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2DZ33            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-PD: 1 Information
-Enclosure Device ID: 32
-Slot Number: 1
-Device Id: 1
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079f5c35
-SAS Address(1): 0x0
-Connected Port Number: 1(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2D9RH            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-Virtual Disk: 1 (Target Id: 1)
-Name:
-RAID Level: Primary-1, Secondary-0, RAID Level Qualifier-0
-Size:69376MB
-State: Optimal
-Stripe Size: 64kB
-Number Of Drives:2
-Span Depth:1
-Default Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Current Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Access Policy: Read/Write
-Disk Cache Policy: Disk's Default
-Number of Spans: 1
-Span: 0 - Number of PDs: 2
-PD: 0 Information
-Enclosure Device ID: 32
-Slot Number: 2
-Device Id: 2
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079fc0c9
-SAS Address(1): 0x0
-Connected Port Number: 2(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2DPST            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-PD: 1 Information
-Enclosure Device ID: 32
-Slot Number: 3
-Device Id: 3
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079dc339
-SAS Address(1): 0x0
-Connected Port Number: 3(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2CKD5            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-
-Exit Code: 0x00
-EOF
 
=== removed file 't/pt-summary/lsi-megaraid-vdevices-0'
--- t/pt-summary/lsi-megaraid-vdevices-0	2011-07-01 16:29:50 +0000
+++ t/pt-summary/lsi-megaraid-vdevices-0	1970-01-01 00:00:00 +0000
@@ -1,132 +0,0 @@
-#!/bin/bash
-#parse_lsi_megaraid_virtual_devices
-
-cat <<EOF > $1
-
-  VirtualDev Size      RAID Level Disks SpnDpth Stripe Status  Cache
-  ========== ========= ========== ===== ======= ====== ======= =========
-  0(no name) 69376MB   1 (1-0-0)      2     1-1   64kB Optimal WB, no RA
-  1(no name) 69376MB   1 (1-0-0)      2     1-1   64kB Optimal WB, no RA
-EOF
-
-cat <<EOF > $2
-[root@pc-db1 ~]# /opt/MegaRAID/MegaCli/MegaCli64 -LdPdInfo -aALL
-                                     
-Adapter #0
-
-Number of Virtual Disks: 2
-Virtual Disk: 0 (Target Id: 0)
-Name:
-RAID Level: Primary-1, Secondary-0, RAID Level Qualifier-0
-Size:69376MB
-State: Optimal
-Stripe Size: 64kB
-Number Of Drives:2
-Span Depth:1
-Default Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Current Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Access Policy: Read/Write
-Disk Cache Policy: Disk's Default
-Number of Spans: 1
-Span: 0 - Number of PDs: 2
-PD: 0 Information
-Enclosure Device ID: 32
-Slot Number: 0
-Device Id: 0
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079f8cf9
-SAS Address(1): 0x0
-Connected Port Number: 0(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2DZ33            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-PD: 1 Information
-Enclosure Device ID: 32
-Slot Number: 1
-Device Id: 1
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079f5c35
-SAS Address(1): 0x0
-Connected Port Number: 1(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2D9RH            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-Virtual Disk: 1 (Target Id: 1)
-Name:
-RAID Level: Primary-1, Secondary-0, RAID Level Qualifier-0
-Size:69376MB
-State: Optimal
-Stripe Size: 64kB
-Number Of Drives:2
-Span Depth:1
-Default Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Current Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Access Policy: Read/Write
-Disk Cache Policy: Disk's Default
-Number of Spans: 1
-Span: 0 - Number of PDs: 2
-PD: 0 Information
-Enclosure Device ID: 32
-Slot Number: 2
-Device Id: 2
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079fc0c9
-SAS Address(1): 0x0
-Connected Port Number: 2(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2DPST            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-PD: 1 Information
-Enclosure Device ID: 32
-Slot Number: 3
-Device Id: 3
-Sequence Number: 2
-Media Error Count: 0
-Other Error Count: 0
-Predictive Failure Count: 0
-Last Predictive Failure Event Seq Number: 0
-PD Type: SAS
-Raw Size: 70007MB [0x88bb93a Sectors]
-Non Coerced Size: 69495MB [0x87bb93a Sectors]
-Coerced Size: 69376MB [0x8780000 Sectors]
-Firmware state: Online
-SAS Address(0): 0x5000c500079dc339
-SAS Address(1): 0x0
-Connected Port Number: 3(path0) 
-Inquiry Data: SEAGATE ST373455SS      S5273LQ2CKD5            
-Foreign State: None 
-Media Type: Hard Disk Device
-
-
-Exit Code: 0x00
-EOF
 
=== removed file 't/pt-summary/lsi-megaraid-vdevices-1'
--- t/pt-summary/lsi-megaraid-vdevices-1	2011-07-01 16:29:50 +0000
+++ t/pt-summary/lsi-megaraid-vdevices-1	1970-01-01 00:00:00 +0000
@@ -1,43 +0,0 @@
-#!/bin/bash
-#parse_lsi_megaraid_virtual_devices
-
-cat <<EOF > $1
-
-  VirtualDev Size      RAID Level Disks SpnDpth Stripe Status  Cache
-  ========== ========= ========== ===== ======= ====== ======= =========
-  0(no name) 69376MB   1 (1-0-0)      2      1-   64kB Optimal WB, no RA
-  1(no name) 69376MB   1 (1-0-0)      2      1-   64kB Optimal WB, no RA
-EOF
-
-cat <<EOF > $2
-[root@pc-db1 ~]# /opt/MegaRAID/MegaCli/MegaCli64 -LDInfo -Lall -aAll
-                                     
-
-Adapter 0 -- Virtual Drive Information:
-Virtual Disk: 0 (Target Id: 0)
-Name:
-RAID Level: Primary-1, Secondary-0, RAID Level Qualifier-0
-Size:69376MB
-State: Optimal
-Stripe Size: 64kB
-Number Of Drives:2
-Span Depth:1
-Default Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Current Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Access Policy: Read/Write
-Disk Cache Policy: Disk's Default
-Virtual Disk: 1 (Target Id: 1)
-Name:
-RAID Level: Primary-1, Secondary-0, RAID Level Qualifier-0
-Size:69376MB
-State: Optimal
-Stripe Size: 64kB
-Number Of Drives:2
-Span Depth:1
-Default Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Current Cache Policy: WriteBack, ReadAheadNone, Direct, No Write Cache if Bad BBU
-Access Policy: Read/Write
-Disk Cache Policy: Disk's Default
-
-Exit Code: 0x00
-EOF
 
=== removed file 't/pt-summary/netstat-summary-01'
--- t/pt-summary/netstat-summary-01	2011-07-01 16:29:50 +0000
+++ t/pt-summary/netstat-summary-01	1970-01-01 00:00:00 +0000
@@ -1,17 +0,0 @@
-#!/bin/bash
-#parse_netstat
-
-cat <<EOF > $1
-  Connections from remote IP addresses
-    192.168.243.72      1
-    192.168.243.81      2
-  Connections to local IP addresses
-    192.168.243.71      3
-  Connections to top 10 local ports
-    3306                3
-  States of connections
-    ESTABLISHED         4
-    LISTEN             15
-EOF
-
-cat samples/netstat-001.txt > $2
 
=== removed file 't/pt-summary/netstat-summary-02'
--- t/pt-summary/netstat-summary-02	2011-07-01 16:29:50 +0000
+++ t/pt-summary/netstat-summary-02	1970-01-01 00:00:00 +0000
@@ -1,30 +0,0 @@
-#!/bin/bash
-#parse_netstat
-
-cat <<EOF > $1
-  Connections from remote IP addresses
-    10.8.0.12           6
-    10.8.0.14           2
-    10.8.0.65           1
-    10.8.0.76          25
-    10.8.0.77           1
-    192.168.5.77        2
-  Connections to local IP addresses
-    10.8.0.75          35
-  Connections to top 10 local ports
-    22                  1
-    3306               25
-    37570               1
-    51071               1
-    51072               1
-    51073               1
-    51074               1
-    52300               1
-    60757               1
-  States of connections
-    ESTABLISHED        30
-    LISTEN              3
-    TIME_WAIT           3
-EOF
-
-cat samples/netstat-003.txt > $2
 
=== removed file 't/pt-summary/parse-arcconf-01'
--- t/pt-summary/parse-arcconf-01	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-arcconf-01	1970-01-01 00:00:00 +0000
@@ -1,154 +0,0 @@
-#!/bin/bash
-#parse_arcconf
-
-cat <<EOF > $1
-       Specs | Adaptec 3405, SAS/SATA, 128 MB cache, Optimal
-     Battery | 99%, 3d1h11m remaining, Optimal
-
-  LogicalDev Size      RAID Disks Stripe Status  Cache
-  ========== ========= ==== ===== ====== ======= =======
-  raid10     279800 MB   10     4 256 KB Optimal On (WB)
-
-  PhysiclDev State   Speed         Vendor  Model        Size        Cache
-  ========== ======= ============= ======= ============ =========== =======
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3146855SS  140014 MB   On (WB)
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3146356SS  140014 MB   On (WB)
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3146356SS  140014 MB   On (WB)
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3146855SS  140014 MB   On (WB)
-EOF
-
-cat <<EOF > $2
-# /usr/StorMan/arcconf getconfig 1
-Controllers found: 1
-----------------------------------------------------------------------
-Controller information
-----------------------------------------------------------------------
-   Controller Status                        : Optimal
-   Channel description                      : SAS/SATA
-   Controller Model                         : Adaptec 3405
-   Controller Serial Number                 : 8C16103E017
-   Physical Slot                            : 1
-   Temperature                              : 35 C/ 95 F (Normal)
-   Installed memory                         : 128 MB
-   Copyback                                 : Disabled
-   Background consistency check             : Disabled
-   Automatic Failover                       : Enabled
-   Global task priority                     : High
-   Stayawake period                         : Disabled
-   Spinup limit internal drives             : 0
-   Spinup limit external drives             : 0
-   Defunct disk drive count                 : 0
-   Logical devices/Failed/Degraded          : 1/0/0
-   --------------------------------------------------------
-   Controller Version Information
-   --------------------------------------------------------
-   BIOS                                     : 5.2-0 (17304)
-   Firmware                                 : 5.2-0 (17304)
-   Driver                                   : 1.1-5 (2461)
-   Boot Flash                               : 5.2-0 (17304)
-   --------------------------------------------------------
-   Controller Battery Information
-   --------------------------------------------------------
-   Status                                   : Optimal
-   Over temperature                         : No
-   Capacity remaining                       : 99 percent
-   Time remaining (at current draw)         : 3 days, 1 hours, 11 minutes
-
-----------------------------------------------------------------------
-Logical device information
-----------------------------------------------------------------------
-Logical device number 0
-   Logical device name                      : raid10
-   RAID level                               : 10
-   Status of logical device                 : Optimal
-   Size                                     : 279800 MB
-   Stripe-unit size                         : 256 KB
-   Read-cache mode                          : Enabled
-   Write-cache mode                         : Enabled (write-back)
-   Write-cache setting                      : Enabled (write-back) when protected by battery
-   Partitioned                              : Unknown
-   Protected by Hot-Spare                   : No
-   Bootable                                 : Yes
-   Failed stripes                           : No
-   Power settings                           : Disabled
-   --------------------------------------------------------
-   Logical device segment information
-   --------------------------------------------------------
-   Group 0, Segment 0                       : Present (0,0) 3LN6552C00009903T8E4
-   Group 0, Segment 1                       : Present (0,1) 3QN26HL400009009KZ0Q
-   Group 1, Segment 0                       : Present (0,2) 3QN1S2AN00009001XVFZ
-   Group 1, Segment 1                       : Present (0,3) 3LN648WZ00009903T916
-
-
-----------------------------------------------------------------------
-Physical Device information
-----------------------------------------------------------------------
-      Device #0
-         Device is a Hard drive
-         State                              : Online
-         Supported                          : Yes
-         Transfer Speed                     : SAS 3.0 Gb/s
-         Reported Channel,Device(T:L)       : 0,0(0:0)
-         Reported Location                  : Connector 0, Device 0
-         Vendor                             : SEAGATE
-         Model                              : ST3146855SS
-         Firmware                           : 0002
-         Serial number                      : 3LN6552C00009903T8E4
-         World-wide name                    : 5000C5000C4DDBB8
-         Size                               : 140014 MB
-         Write Cache                        : Enabled (write-back)
-         FRU                                : None
-         S.M.A.R.T.                         : No
-      Device #1
-         Device is a Hard drive
-         State                              : Online
-         Supported                          : Yes
-         Transfer Speed                     : SAS 3.0 Gb/s
-         Reported Channel,Device(T:L)       : 0,1(1:0)
-         Reported Location                  : Connector 0, Device 1
-         Vendor                             : SEAGATE
-         Model                              : ST3146356SS
-         Firmware                           : 0005
-         Serial number                      : 3QN26HL400009009KZ0Q
-         World-wide name                    : 5000C50016F5E66C
-         Size                               : 140014 MB
-         Write Cache                        : Enabled (write-back)
-         FRU                                : None
-         S.M.A.R.T.                         : No
-      Device #2
-         Device is a Hard drive
-         State                              : Online
-         Supported                          : Yes
-         Transfer Speed                     : SAS 3.0 Gb/s
-         Reported Channel,Device(T:L)       : 0,2(2:0)
-         Reported Location                  : Connector 0, Device 2
-         Vendor                             : SEAGATE
-         Model                              : ST3146356SS
-         Firmware                           : 0005
-         Serial number                      : 3QN1S2AN00009001XVFZ
-         World-wide name                    : 5000C50016F5EF4C
-         Size                               : 140014 MB
-         Write Cache                        : Enabled (write-back)
-         FRU                                : None
-         S.M.A.R.T.                         : No
-      Device #3
-         Device is a Hard drive
-         State                              : Online
-         Supported                          : Yes
-         Transfer Speed                     : SAS 3.0 Gb/s
-         Reported Channel,Device(T:L)       : 0,3(3:0)
-         Reported Location                  : Connector 0, Device 3
-         Vendor                             : SEAGATE
-         Model                              : ST3146855SS
-         Firmware                           : 0002
-         Serial number                      : 3LN648WZ00009903T916
-         World-wide name                    : 5000C5000C4DEA60
-         Size                               : 140014 MB
-         Write Cache                        : Enabled (write-back)
-         FRU                                : None
-         S.M.A.R.T.                         : No
-
-
-Command completed successfully.
-
-EOF
 
=== removed file 't/pt-summary/parse-arcconf-02'
--- t/pt-summary/parse-arcconf-02	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-arcconf-02	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-#!/bin/bash
-#parse_arcconf
-
-cat <<EOF > $1
-       Specs | Adaptec 3405, SAS/SATA, 128 MB cache, Optimal
-     Battery | 99%, 3d1h11m remaining, Optimal
-
-  LogicalDev Size      RAID Disks Stripe Status  Cache
-  ========== ========= ==== ===== ====== ======= =======
-  Raid10-A   571392 MB   10     4 256 KB Optimal On (WB)
-
-  PhysiclDev State   Speed         Vendor  Model        Size        Cache
-  ========== ======= ============= ======= ============ =========== =======
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3300655SS  286102 MB   On (WB)
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3300655SS  286102 MB   On (WB)
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3300655SS  286102 MB   On (WB)
-  Hard drive Online  SAS 3.0 Gb/s  SEAGATE ST3300655SS  286102 MB   On (WB)
-EOF
-
-cat samples/arcconf-002.txt > $2
 
=== removed file 't/pt-summary/parse-dmesg-raid-01'
--- t/pt-summary/parse-dmesg-raid-01	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-dmesg-raid-01	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-#parse_raid_controller_dmesg
-
-cat <<EOF > $1
-Fusion-MPT SAS
-EOF
-
-cat samples/dmesg-001.txt > $2
 
=== removed file 't/pt-summary/parse-dmesg-raid-02'
--- t/pt-summary/parse-dmesg-raid-02	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-dmesg-raid-02	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-#parse_raid_controller_dmesg
-
-cat <<EOF > $1
-AACRAID
-EOF
-
-cat samples/dmesg-002.txt > $2
 
=== removed file 't/pt-summary/parse-dmesg-raid-03'
--- t/pt-summary/parse-dmesg-raid-03	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-dmesg-raid-03	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-#parse_raid_controller_dmesg
-
-cat <<EOF > $1
-LSI Logic MegaRAID SAS
-EOF
-
-cat samples/dmesg-003.txt > $2
 
=== removed file 't/pt-summary/parse-dmesg-raid-04'
--- t/pt-summary/parse-dmesg-raid-04	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-dmesg-raid-04	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-#!/bin/bash
-#parse_raid_controller_dmesg
-
-cat <<EOF > $1
-AACRAID
-EOF
-
-cat samples/dmesg-004.txt > $2
 
=== removed file 't/pt-summary/parse-dmidecode-mem-devices-01'
--- t/pt-summary/parse-dmidecode-mem-devices-01	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-dmidecode-mem-devices-01	1970-01-01 00:00:00 +0000
@@ -1,465 +0,0 @@
-#!/bin/bash
-#parse_dmidecode_mem_devices
-
-cat <<EOF > $1
-  Locator   Size     Speed             Form Factor   Type          Type Detail
-  ========= ======== ================= ============= ============= ===========
-  SODIMM0   2048 MB  800 MHz           SODIMM        Other         Synchronous
-  SODIMM1   2048 MB  800 MHz           SODIMM        Other         Synchronous
-EOF
-
-cat <<EOF > $2
-# dmidecode 2.10
-SMBIOS 2.5 present.
-41 structures occupying 1867 bytes.
-Table at 0x000FCCE0.
-
-Handle 0x0000, DMI type 0, 24 bytes
-BIOS Information
-	Vendor: American Megatrends Inc.
-	Version: 211    
-	Release Date: 10/20/2009
-	Address: 0xF0000
-	Runtime Size: 64 kB
-	ROM Size: 1024 kB
-	Characteristics:
-		ISA is supported
-		PCI is supported
-		PNP is supported
-		BIOS is upgradeable
-		BIOS shadowing is allowed
-		ESCD support is available
-		Boot from CD is supported
-		Selectable boot is supported
-		EDD is supported
-		5.25"/1.2 MB floppy services are supported (int 13h)
-		3.5"/720 kB floppy services are supported (int 13h)
-		3.5"/2.88 MB floppy services are supported (int 13h)
-		Print screen service is supported (int 5h)
-		8042 keyboard services are supported (int 9h)
-		Printer services are supported (int 17h)
-		CGA/mono video services are supported (int 10h)
-		ACPI is supported
-		USB legacy is supported
-		Smart battery is supported
-		BIOS boot specification is supported
-		Function key-initiated network boot is supported
-		Targeted content distribution is supported
-	BIOS Revision: 2.11
-	Firmware Revision: 32.1
-
-Handle 0x0001, DMI type 1, 27 bytes
-System Information
-	Manufacturer: ASUSTeK Computer Inc.        
-	Product Name: UL30A               
-	Version: 1.0       
-	Serial Number: 102677490240        
-	UUID: 009FC67B-8AD1-DE81-2E8E-90E6BAF39C70
-	Wake-up Type: Power Switch
-	SKU Number:                     
-	Family:                     
-
-Handle 0x0002, DMI type 2, 15 bytes
-Base Board Information
-	Manufacturer: ASUSTeK Computer Inc.        
-	Product Name: UL30A     
-	Version: 1.0       
-	Serial Number: BSN12345678901234567
-	Asset Tag: ATN12345678901234567
-	Features:
-		Board is a hosting board
-		Board requires at least one daughter board
-		Board is replaceable
-	Location In Chassis: MIDDLE              
-	Chassis Handle: 0x0003
-	Type: Motherboard
-	Contained Object Handles: 0
-
-Handle 0x0003, DMI type 3, 21 bytes
-Chassis Information
-	Manufacturer: ASUSTeK Computer Inc.        
-	Type: Notebook
-	Lock: Not Present
-	Version: 1.0       
-	Serial Number: CSN12345678901234567
-	Asset Tag: ATN12345678901234567
-	Boot-up State: Safe
-	Power Supply State: Safe
-	Thermal State: Other
-	Security Status: Other
-	OEM Information: 0x00000000
-	Height: Unspecified
-	Number Of Power Cords: 1
-	Contained Elements: 0
-
-Handle 0x0004, DMI type 4, 40 bytes
-Processor Information
-	Socket Designation: Socket 478
-	Type: Central Processor
-	Family: Other
-	Manufacturer: Intel            
-	ID: 7A 06 01 00 FF FB EB BF
-	Version: Genuine Intel(R) CPU U7300 @ 1.30GHz                
-	Voltage: 1.0 V
-	External Clock: 200 MHz
-	Max Speed: 1300 MHz
-	Current Speed: 1300 MHz
-	Status: Populated, Enabled
-	Upgrade: Socket 478
-	L1 Cache Handle: 0x0005
-	L2 Cache Handle: 0x0007
-	L3 Cache Handle: Not Provided
-	Serial Number: PSN12345678901234567
-	Asset Tag: PATN1234567890123456
-	Part Number: PPN12345678901234567
-	Core Count: 2
-	Core Enabled: 2
-	Thread Count: 2
-	Characteristics:
-		64-bit capable
-
-Handle 0x0005, DMI type 7, 19 bytes
-Cache Information
-	Socket Designation: L1-Cache
-	Configuration: Enabled, Not Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 64 kB
-	Maximum Size: 64 kB
-	Supported SRAM Types:
-		Other
-	Installed SRAM Type: Other
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Data
-	Associativity: 8-way Set-associative
-
-Handle 0x0006, DMI type 7, 19 bytes
-Cache Information
-	Socket Designation: L1-Cache
-	Configuration: Enabled, Not Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 64 kB
-	Maximum Size: 64 kB
-	Supported SRAM Types:
-		Other
-	Installed SRAM Type: Other
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Instruction
-	Associativity: 8-way Set-associative
-
-Handle 0x0007, DMI type 7, 19 bytes
-Cache Information
-	Socket Designation: L2-Cache
-	Configuration: Enabled, Not Socketed, Level 2
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 3072 kB
-	Maximum Size: 3072 kB
-	Supported SRAM Types:
-		Other
-	Installed SRAM Type: Other
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: Other
-
-Handle 0x0008, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J3401
-	Internal Connector Type: None
-	External Reference Designator: LAN
-	External Connector Type: RJ-45
-	Port Type: Network Port
-
-Handle 0x0009, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J4501
-	Internal Connector Type: None
-	External Reference Designator: VGA
-	External Connector Type: DB-15 female
-	Port Type: Video Port
-
-Handle 0x000A, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J5201
-	Internal Connector Type: None
-	External Reference Designator: USB1
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x000B, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J5201
-	Internal Connector Type: None
-	External Reference Designator: USB2
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x000C, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J4800
-	Internal Connector Type: None
-	External Reference Designator: HDMI
-	External Connector Type: Other
-	Port Type: Other
-
-Handle 0x000D, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J5101
-	Internal Connector Type: None
-	External Reference Designator: SATA 1
-	External Connector Type: SAS/SATA Plug Receptacle
-	Port Type: SATA
-
-Handle 0x000E, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J4202
-	Internal Connector Type: None
-	External Reference Designator: FlashCard
-	External Connector Type: Other
-	Port Type: Other
-
-Handle 0x000F, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J4301
-	Internal Connector Type: None
-	External Reference Designator: ExpressCard
-	External Connector Type: Other
-	Port Type: Other
-
-Handle 0x0010, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J6601
-	Internal Connector Type: None
-	External Reference Designator: eSATA
-	External Connector Type: SAS/SATA Plug Receptacle
-	Port Type: SATA
-
-Handle 0x0011, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J3703
-	Internal Connector Type: None
-	External Reference Designator: Audio Out
-	External Connector Type: Mini Jack (headphones)
-	Port Type: Audio Port
-
-Handle 0x0012, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J3801
-	Internal Connector Type: None
-	External Reference Designator: Mic In
-	External Connector Type: Mini Jack (headphones)
-	Port Type: Audio Port
-
-Handle 0x0013, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J2502
-	Internal Connector Type: None
-	External Reference Designator: USB3
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0014, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J4203
-	Internal Connector Type: None
-	External Reference Designator: 1394
-	External Connector Type: IEEE 1394
-	Port Type: Firewire (IEEE P1394)
-
-Handle 0x0015, DMI type 8, 9 bytes
-Port Connector Information
-	Internal Reference Designator: J5401
-	Internal Connector Type: None
-	External Reference Designator: DockPort
-	External Connector Type: Other
-	Port Type: Other
-
-Handle 0x0016, DMI type 9, 13 bytes
-System Slot Information
-	Designation: PCIE1
-	Type: x1 PCI Express
-	Current Usage: In Use
-	Length: Short
-	ID: 0
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x0017, DMI type 9, 13 bytes
-System Slot Information
-	Designation: PCIE2
-	Type: x1 PCI Express
-	Current Usage: Available
-	Length: Short
-	ID: 1
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x0018, DMI type 9, 13 bytes
-System Slot Information
-	Designation: PCIE3
-	Type: x1 PCI Express
-	Current Usage: Available
-	Length: Short
-	ID: 2
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x0019, DMI type 9, 13 bytes
-System Slot Information
-	Designation: PCIE4
-	Type: x1 PCI Express
-	Current Usage: Available
-	Length: Short
-	ID: 3
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x001A, DMI type 10, 6 bytes
-On Board Device Information
-	Type: Video
-	Status: Enabled
-	Description:  UMA
-
-Handle 0x001B, DMI type 10, 6 bytes
-On Board Device Information
-	Type: Ethernet
-	Status: Enabled
-	Description:  NIC
-
-Handle 0x001C, DMI type 10, 6 bytes
-On Board Device Information
-	Type: Sound
-	Status: Enabled
-	Description:  Audio Codec
-
-Handle 0x001D, DMI type 10, 6 bytes
-On Board Device Information
-	Type: SATA Controller
-	Status: Enabled
-	Description:  SATA Controller
-
-Handle 0x001E, DMI type 10, 6 bytes
-On Board Device Information
-	Type: Other
-	Status: Enabled
-	Description:  1394/FlashCardReader
-
-Handle 0x001F, DMI type 13, 22 bytes
-BIOS Language Information
-	Installable Languages: 1
-		en|US|iso8859-1
-	Currently Installed Language: en|US|iso8859-1
-
-Handle 0x0020, DMI type 16, 15 bytes
-Physical Memory Array
-	Location: System Board Or Motherboard
-	Use: System Memory
-	Error Correction Type: None
-	Maximum Capacity: 8 GB
-	Error Information Handle: Not Provided
-	Number Of Devices: 2
-
-Handle 0x0021, DMI type 19, 15 bytes
-Memory Array Mapped Address
-	Starting Address: 0x00000000000
-	Ending Address: 0x000FFFFFFFF
-	Range Size: 4 GB
-	Physical Array Handle: 0x0020
-	Partition Width: 0
-
-Handle 0x0022, DMI type 17, 27 bytes
-Memory Device
-	Array Handle: 0x0020
-	Error Information Handle: Not Provided
-	Total Width: 64 bits
-	Data Width: 64 bits
-	Size: 2048 MB
-	Form Factor: SODIMM
-	Set: None
-	Locator: SODIMM0
-	Bank Locator: BANK0
-	Type: Other
-	Type Detail: Synchronous
-	Speed: 800 MHz
-	Manufacturer: N/A                           
-	Serial Number: N/A                           
-	Asset Tag: N/A                           
-	Part Number: N/A                           
-
-Handle 0x0023, DMI type 20, 19 bytes
-Memory Device Mapped Address
-	Starting Address: 0x00000000000
-	Ending Address: 0x0007FFFFFFF
-	Range Size: 2 GB
-	Physical Device Handle: 0x0022
-	Memory Array Mapped Address Handle: 0x0021
-	Partition Row Position: Unknown
-	Interleave Position: Unknown
-	Interleaved Data Depth: Unknown
-
-Handle 0x0024, DMI type 17, 27 bytes
-Memory Device
-	Array Handle: 0x0020
-	Error Information Handle: Not Provided
-	Total Width: 64 bits
-	Data Width: 64 bits
-	Size: 2048 MB
-	Form Factor: SODIMM
-	Set: None
-	Locator: SODIMM1
-	Bank Locator: BANK1
-	Type: Other
-	Type Detail: Synchronous
-	Speed: 800 MHz
-	Manufacturer: N/A                           
-	Serial Number: N/A                           
-	Asset Tag: N/A                           
-	Part Number: N/A                           
-
-Handle 0x0025, DMI type 20, 19 bytes
-Memory Device Mapped Address
-	Starting Address: 0x00080000000
-	Ending Address: 0x000FFFFFFFF
-	Range Size: 2 GB
-	Physical Device Handle: 0x0024
-	Memory Array Mapped Address Handle: 0x0021
-	Partition Row Position: Unknown
-	Interleave Position: Unknown
-	Interleaved Data Depth: Unknown
-
-Handle 0x0026, DMI type 22, 26 bytes
-Portable Battery
-	Location: In the back
-	Manufacturer: AS176NC2KF
-	Manufacture Date: 09/08/03
-	Serial Number: @800
-	Name: UL50-44         
-	Chemistry: Other
-	Design Capacity: 4400 mWh
-	Design Voltage: 14400 mV
-	SBDS Version: SMART Ver 0123
-	Maximum Error: Unknown
-	OEM-specific Information: 0x00000000
-
-Handle 0x0027, DMI type 200, 27 bytes
-OEM-specific Type
-	Header and Data:
-		C8 1B 27 00 01 02 03 00 00 00 00 00 00 00 00 00
-		00 00 00 00 00 00 00 00 00 00 00
-	Strings:
-		ASUSTeK Computer Inc.        
-		Notebook  
-		1.0       
-
-Handle 0x0028, DMI type 127, 4 bytes
-End Of Table
-
-EOF
 
=== removed file 't/pt-summary/parse-dmidecode-mem-devices-02'
--- t/pt-summary/parse-dmidecode-mem-devices-02	2011-07-01 16:29:50 +0000
+++ t/pt-summary/parse-dmidecode-mem-devices-02	1970-01-01 00:00:00 +0000
@@ -1,750 +0,0 @@
-#!/bin/bash
-#parse_dmidecode_mem_devices
-
-cat <<EOF > $1
-  Locator   Size     Speed             Form Factor   Type          Type Detail
-  ========= ======== ================= ============= ============= ===========
-  DIMM1     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM2     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM3     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM4     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM5     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM6     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM7     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-  DIMM8     2048 MB  667 MHz (1.5 ns)  {OUT OF SPEC} {OUT OF SPEC} Synchronous
-EOF
-
-cat <<EOF > $2
-# dmidecode 2.7
-SMBIOS 2.4 present.
-64 structures occupying 3240 bytes.
-Table at 0xBFB9C000.
-
-Handle 0xDA00, DMI type 218, 11 bytes.
-OEM-specific Type
-	Header and Data:
-		DA 0B 00 DA B2 00 17 00 0E 20 00
-
-Handle 0x0000, DMI type 0, 24 bytes.
-BIOS Information
-	Vendor: Dell Inc.
-	Version: 2.0.1
-	Release Date: 10/27/2007
-	Address: 0xF0000
-	Runtime Size: 64 kB
-	ROM Size: 1024 kB
-	Characteristics:
-		ISA is supported
-		PCI is supported
-		PNP is supported
-		BIOS is upgradeable
-		BIOS shadowing is allowed
-		ESCD support is available
-		Boot from CD is supported
-		Selectable boot is supported
-		EDD is supported
-		Japanese floppy for Toshiba 1.2 MB is supported (int 13h)
-		5.25"/360 KB floppy services are supported (int 13h)
-		5.25"/1.2 MB floppy services are supported (int 13h)
-		3.5"/720 KB floppy services are supported (int 13h)
-		Print screen service is supported (int 5h)
-		8042 keyboard services are supported (int 9h)
-		Serial services are supported (int 14h)
-		Printer services are supported (int 17h)
-		CGA/mono video services are supported (int 10h)
-		ACPI is supported
-		USB legacy is supported
-		BIOS boot specification is supported
-		Function key-initiated network boot is supported
-		Targeted content distribution is supported
-	BIOS Revision: 0.1
-
-Handle 0x0100, DMI type 1, 27 bytes.
-System Information
-	Manufacturer: Dell Inc.
-	Product Name: PowerEdge 2950
-	Version: Not Specified
-	Serial Number: JQ8DMF1
-	UUID: 44454C4C-5100-1038-8044-CAC04F4D4631
-	Wake-up Type: Power Switch
-	SKU Number: Not Specified
-	Family: Not Specified
-
-Handle 0x0200, DMI type 2, 9 bytes.
-Base Board Information
-	Manufacturer: Dell Inc.
-	Product Name: 0DP246
-	Version: A00
-	Serial Number: ..CN7082181S008M.
-
-Handle 0x0300, DMI type 3, 21 bytes.
-Chassis Information
-	Manufacturer: Dell Inc.
-	Type: Rack Mount Chassis
-	Lock: Present
-	Version: Not Specified
-	Serial Number: JQ8DMF1
-	Asset Tag: Not Specified
-	Boot-up State: Safe
-	Power Supply State: Safe
-	Thermal State: Safe
-	Security Status: Unknown
-	OEM Information: 0x00000000
-	Heigth: 2 U
-	Number Of Power Cords: Unspecified
-	Contained Elements: 0
-
-Handle 0x0400, DMI type 4, 40 bytes.
-Processor Information
-	Socket Designation: CPU1
-	Type: Central Processor
-	Family: Xeon
-	Manufacturer: Intel
-	ID: FB 06 00 00 FF FB EB BF
-	Signature: Type 0, Family 6, Model 15, Stepping 11
-	Flags:
-		FPU (Floating-point unit on-chip)
-		VME (Virtual mode extension)
-		DE (Debugging extension)
-		PSE (Page size extension)
-		TSC (Time stamp counter)
-		MSR (Model specific registers)
-		PAE (Physical address extension)
-		MCE (Machine check exception)
-		CX8 (CMPXCHG8 instruction supported)
-		APIC (On-chip APIC hardware supported)
-		SEP (Fast system call)
-		MTRR (Memory type range registers)
-		PGE (Page global enable)
-		MCA (Machine check architecture)
-		CMOV (Conditional move instruction supported)
-		PAT (Page attribute table)
-		PSE-36 (36-bit page size extension)
-		CLFSH (CLFLUSH instruction supported)
-		DS (Debug store)
-		ACPI (ACPI supported)
-		MMX (MMX technology supported)
-		FXSR (Fast floating-point save and restore)
-		SSE (Streaming SIMD extensions)
-		SSE2 (Streaming SIMD extensions 2)
-		SS (Self-snoop)
-		HTT (Hyper-threading technology)
-		TM (Thermal monitor supported)
-		PBE (Pending break enabled)
-	Version: Intel(R) Xeon(R) CPU           E5320  @ 1.86GHz
-	Voltage: 1.4 V
-	External Clock: 1066 MHz
-	Max Speed: 3600 MHz
-	Current Speed: 1867 MHz
-	Status: Populated, Enabled
-	Upgrade: <OUT OF SPEC>
-	L1 Cache Handle: 0x0700
-	L2 Cache Handle: 0x0701
-	L3 Cache Handle: 0x0702
-	Serial Number: Not Specified
-	Asset Tag: Not Specified
-	Part Number: Not Specified
-
-Handle 0x0401, DMI type 4, 40 bytes.
-Processor Information
-	Socket Designation: CPU2
-	Type: Central Processor
-	Family: Xeon
-	Manufacturer: Intel
-	ID: FB 06 00 00 FF FB EB BF
-	Signature: Type 0, Family 6, Model 15, Stepping 11
-	Flags:
-		FPU (Floating-point unit on-chip)
-		VME (Virtual mode extension)
-		DE (Debugging extension)
-		PSE (Page size extension)
-		TSC (Time stamp counter)
-		MSR (Model specific registers)
-		PAE (Physical address extension)
-		MCE (Machine check exception)
-		CX8 (CMPXCHG8 instruction supported)
-		APIC (On-chip APIC hardware supported)
-		SEP (Fast system call)
-		MTRR (Memory type range registers)
-		PGE (Page global enable)
-		MCA (Machine check architecture)
-		CMOV (Conditional move instruction supported)
-		PAT (Page attribute table)
-		PSE-36 (36-bit page size extension)
-		CLFSH (CLFLUSH instruction supported)
-		DS (Debug store)
-		ACPI (ACPI supported)
-		MMX (MMX technology supported)
-		FXSR (Fast floating-point save and restore)
-		SSE (Streaming SIMD extensions)
-		SSE2 (Streaming SIMD extensions 2)
-		SS (Self-snoop)
-		HTT (Hyper-threading technology)
-		TM (Thermal monitor supported)
-		PBE (Pending break enabled)
-	Version: Intel(R) Xeon(R) CPU           E5320  @ 1.86GHz
-	Voltage: 1.4 V
-	External Clock: 1066 MHz
-	Max Speed: 3600 MHz
-	Current Speed: 1867 MHz
-	Status: Populated, Idle
-	Upgrade: <OUT OF SPEC>
-	L1 Cache Handle: 0x0703
-	L2 Cache Handle: 0x0704
-	L3 Cache Handle: 0x0705
-	Serial Number: Not Specified
-	Asset Tag: Not Specified
-	Part Number: Not Specified
-
-Handle 0x0700, DMI type 7, 19 bytes.
-Cache Information
-	Socket Designation: Not Specified
-	Configuration: Enabled, Not Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 128 KB
-	Maximum Size: 128 KB
-	Supported SRAM Types:
-		Unknown
-	Installed SRAM Type: Unknown
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Data
-	Associativity: 8-way Set-associative
-
-Handle 0x0701, DMI type 7, 19 bytes.
-Cache Information
-	Socket Designation: Not Specified
-	Configuration: Enabled, Not Socketed, Level 2
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 8192 KB
-	Maximum Size: 8192 KB
-	Supported SRAM Types:
-		Unknown
-	Installed SRAM Type: Unknown
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: 16-way Set-associative
-
-Handle 0x0702, DMI type 7, 19 bytes.
-Cache Information
-	Socket Designation: Not Specified
-	Configuration: Enabled, Not Socketed, Level 3
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 0 KB
-	Maximum Size: 0 KB
-	Supported SRAM Types:
-		Unknown
-	Installed SRAM Type: Unknown
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: Unknown
-
-Handle 0x0703, DMI type 7, 19 bytes.
-Cache Information
-	Socket Designation: Not Specified
-	Configuration: Enabled, Not Socketed, Level 1
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 128 KB
-	Maximum Size: 128 KB
-	Supported SRAM Types:
-		Unknown
-	Installed SRAM Type: Unknown
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Data
-	Associativity: 8-way Set-associative
-
-Handle 0x0704, DMI type 7, 19 bytes.
-Cache Information
-	Socket Designation: Not Specified
-	Configuration: Enabled, Not Socketed, Level 2
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 8192 KB
-	Maximum Size: 8192 KB
-	Supported SRAM Types:
-		Unknown
-	Installed SRAM Type: Unknown
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: 16-way Set-associative
-
-Handle 0x0705, DMI type 7, 19 bytes.
-Cache Information
-	Socket Designation: Not Specified
-	Configuration: Enabled, Not Socketed, Level 3
-	Operational Mode: Write Back
-	Location: Internal
-	Installed Size: 0 KB
-	Maximum Size: 0 KB
-	Supported SRAM Types:
-		Unknown
-	Installed SRAM Type: Unknown
-	Speed: Unknown
-	Error Correction Type: Single-bit ECC
-	System Type: Unified
-	Associativity: Unknown
-
-Handle 0x0800, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: DB-15 female
-	Port Type: Video Port
-
-Handle 0x0801, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: DB-15 female
-	Port Type: Video Port
-
-Handle 0x0802, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0803, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0804, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0805, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: Access Bus (USB)
-	Port Type: USB
-
-Handle 0x0806, DMI type 126, 9 bytes.
-Inactive
-
-Handle 0x0807, DMI type 126, 9 bytes.
-Inactive
-
-Handle 0x0808, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: Access Bus (USB)
-	External Reference Designator: Not Specified
-	External Connector Type: None
-	Port Type: USB
-
-Handle 0x0809, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: RJ-45
-	Port Type: Network Port
-
-Handle 0x080A, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: RJ-45
-	Port Type: Network Port
-
-Handle 0x080B, DMI type 8, 9 bytes.
-Port Connector Information
-	Internal Reference Designator: Not Specified
-	Internal Connector Type: None
-	External Reference Designator: Not Specified
-	External Connector Type: DB-9 male
-	Port Type: Serial Port 16550A Compatible
-
-Handle 0x0900, DMI type 9, 13 bytes.
-System Slot Information
-	Designation: PCI1
-	Type: x8 PCI Express
-	Current Usage: Available
-	Length: Long
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x0901, DMI type 9, 13 bytes.
-System Slot Information
-	Designation: PCI2
-	Type: x8 PCI Express
-	Current Usage: Available
-	Length: Long
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x0902, DMI type 9, 13 bytes.
-System Slot Information
-	Designation: PCI3
-	Type: x4 PCI Express
-	Current Usage: Available
-	Length: Long
-	Characteristics:
-		3.3 V is provided
-		PME signal is supported
-
-Handle 0x0903, DMI type 126, 13 bytes.
-Inactive
-
-Handle 0x0904, DMI type 126, 13 bytes.
-Inactive
-
-Handle 0x0905, DMI type 126, 13 bytes.
-Inactive
-
-Handle 0x0A00, DMI type 10, 10 bytes.
-On Board Device 1 Information
-	Type: Video
-	Status: Enabled
-	Description: Embedded ATI ES1000 Video
-On Board Device 2 Information
-	Type: Ethernet
-	Status: Enabled
-	Description: Embedded Broadcom 5708 NIC 1