[emt] r208 committed - Updated the output of emt_view -l. I also fixed a huge bug in the test...

[e...@googlecode.com]

Revision: 208
Author: eric.bergen
Date: Mon Aug 16 21:49:09 2010
Log: Updated the output of emt_view -l. I also fixed a huge bug in the
tests where an echo I added to make the output pretty made the tests always
succeed. I also updated the description of the send_* network fields to say
send in the description.

http://code.google.com/p/emt/source/detail?r=208

Modified:
/trunk/base/emt_read.php
/trunk/bin/emt_view
/trunk/plugins/fields/network.php
/trunk/test/golden/emt_view
/trunk/test/golden/emt_view_multiple
/trunk/test/golden/emt_view_single
/trunk/test/test.sh

=======================================
--- /trunk/base/emt_read.php Tue Jul 13 16:08:06 2010
+++ /trunk/base/emt_read.php Mon Aug 16 21:49:09 2010
@@ -302,19 +302,37 @@
}

- $max_len = 0;
+ $max_field_len = $max_fname_len = 0;
foreach($view->fields as $field_name)
- if (($l = strlen($field_name)) > $max_len)
- $max_len = $l;
-
- $max_len += 2;
+ {
+ $field_obj_name = $field_name . '_field';
+ $f = new $field_obj_name;
+
+ if (($l = strlen($field_name)) > $max_field_len)
+ $max_field_len = $l;
+
+ if (($l = strlen($f->fname)) > $max_fname_len)
+ $max_fname_len = $l;
+
+ }
+
+ $max_field_len += 2;
+ $max_fname_len += 2;
+
foreach($view->fields as $field_name)
{
- print "$field_name\n";
+ $field_obj_name = $field_name . '_field';
+ $f = new $field_obj_name;
+ print str_pad($f->name, $max_field_len) . ' ';
+ print str_pad($f->fname, $max_fname_len) . ' ';
+ print "\n ";
+ print $f->description . "\n";

for ($i = 0; isset($records[$i]); $i++)
if ($records[$i]->name == $field_name &&
$records[$i]->sub_field)
- print " " . $records[$i]->sub_field . "\n";
+ print " " . $records[$i]->sub_field . "\n";
+
+ print "\n";
}

exit;
=======================================
--- /trunk/bin/emt_view Wed Jul 14 13:56:24 2010
+++ /trunk/bin/emt_view Mon Aug 16 21:49:09 2010
@@ -128,9 +128,7 @@
}

print "\n";
- for ($i = 0; isset($disp_f[$i]); $i++)
- print str_pad($disp_f[$i]->fname, $disp_f[$i]->display_len + 1);
-
+ common_header($disp_f, 'fname');

print "\n";
for ($i = 0; isset($disp_f[$i]); $i++)
@@ -191,3 +189,4 @@
$matches[3],
$matches[1]);
}
+
=======================================
--- /trunk/plugins/fields/network.php Tue Apr 28 15:12:11 2009
+++ /trunk/plugins/fields/network.php Mon Aug 16 21:49:09 2010
@@ -121,7 +121,7 @@
var $namespace = 'network';
var $name = 'send_bytes';
var $fname = 'Send Bytes';
- var $description = 'Network Bytes Received';
+ var $description = 'Network Bytes Sent';
var $display_format = DISPLAY_BYTES;
}

@@ -131,7 +131,7 @@
var $namespace = 'network';
var $name = 'send_packets';
var $fname = 'Send Pckts';
- var $description = 'Network Packets Received';
+ var $description = 'Network Packets Sent';
}

register_field('send_errs');
@@ -140,7 +140,7 @@
var $namespace = 'network';
var $name = 'send_errs';
var $fname = 'Send Errs';
- var $description = 'Network Errors Received';
+ var $description = 'Network Errors Sent';
}

register_field('send_drop');
@@ -149,7 +149,7 @@
var $namespace = 'network';
var $name = 'send_drop';
var $fname = 'Send Drop';
- var $description = 'Network Send Packets Dropped';
+ var $description = 'Network Sent Packets Dropped';
}

register_field('send_fifo');
@@ -158,5 +158,5 @@
var $namespace = 'network';
var $name = 'send_fifo';
var $fname = 'Send Fifo';
- var $description = 'Network Send Fifo';
-}
+ var $description = 'Network Sent Fifo';
+}
=======================================
--- /trunk/test/golden/emt_view Fri Jun 25 15:45:34 2010
+++ /trunk/test/golden/emt_view Mon Aug 16 21:49:09 2010
@@ -1,5 +1,5 @@
[-------emt-------]
[-------------------------------------test------------------------------------]
[-----------------] [---------------inst_one--------------]
[---------------inst_two--------------]
-Sampling Start Time Test Multiple Test Multiple Test Single Test Multiple
Test Multiple Test Single
+Sampling Start Time [------Test Multiple------] Test Single [------Test
Multiple------] Test Single
bar foo bar
foo
2010-06-25 15:09:06 3 2 1 13
12 11
=======================================
--- /trunk/test/golden/emt_view_multiple Fri Jun 18 15:04:30 2010
+++ /trunk/test/golden/emt_view_multiple Mon Aug 16 21:49:09 2010
@@ -1,5 +1,7 @@
-test_multiple
- foo
- bar
- bar
- foo
+test_multiple Test Multiple
+ This is a multie value field
+ foo
+ bar
+ bar
+ foo
+
=======================================
--- /trunk/test/golden/emt_view_single Fri Jun 18 15:04:30 2010
+++ /trunk/test/golden/emt_view_single Mon Aug 16 21:49:09 2010
@@ -1,1 +1,3 @@
-test_single
+test_single Test Single
+ This is a single field
+
=======================================
--- /trunk/test/test.sh Fri Jun 25 15:45:34 2010
+++ /trunk/test/test.sh Mon Aug 16 21:49:09 2010
@@ -15,12 +15,14 @@

echo "Testing multiple field emt_view -l -f"
../bin/emt_view -l -f test_multiple | sed -r "$SED_CMD" >
run/emt_view_multiple
-diff golden/ run/ > /dev/null
-echo
+diff -u golden/ run/ > /dev/null
+#Don't put an echo here. It makers the tests always pass.
if [ $? == 1 ]; then
+ echo
echo "Test FAILED!";
echo
diff -u golden/ run/
else
+ echo
echo "Success!"
fi