|
From: <sv...@va...> - 2009-02-26 22:26:51
|
Author: njn
Date: 2009-02-26 22:26:45 +0000 (Thu, 26 Feb 2009)
New Revision: 9284
Log:
Merge r9283 (lackey testing fixes) from the DARWIN branch.
Modified:
trunk/lackey/lk_main.c
trunk/lackey/tests/filter_stderr
trunk/lackey/tests/true.stderr.exp
trunk/tests/filter_numbers
Modified: trunk/lackey/lk_main.c
===================================================================
--- trunk/lackey/lk_main.c 2009-02-26 22:25:10 UTC (rev 9283)
+++ trunk/lackey/lk_main.c 2009-02-26 22:26:45 UTC (rev 9284)
@@ -886,12 +886,12 @@
VG_(message)(Vg_UserMsg, "");
VG_(message)(Vg_UserMsg, "Ratios:");
tl_assert(n_SBs_entered); // Paranoia time.
- VG_(message)(Vg_UserMsg, " guest instrs : SB entered = %3llu : 10",
+ VG_(message)(Vg_UserMsg, " guest instrs : SB entered = %'llu : 10",
10 * n_guest_instrs / n_SBs_entered);
- VG_(message)(Vg_UserMsg, " IRStmts : SB entered = %3llu : 10",
+ VG_(message)(Vg_UserMsg, " IRStmts : SB entered = %'llu : 10",
10 * n_IRStmts / n_SBs_entered);
tl_assert(n_guest_instrs); // Paranoia time.
- VG_(message)(Vg_UserMsg, " IRStmts : guest instr = %3llu : 10",
+ VG_(message)(Vg_UserMsg, " IRStmts : guest instr = %'llu : 10",
10 * n_IRStmts / n_guest_instrs);
}
Modified: trunk/lackey/tests/filter_stderr
===================================================================
--- trunk/lackey/tests/filter_stderr 2009-02-26 22:25:10 UTC (rev 9283)
+++ trunk/lackey/tests/filter_stderr 2009-02-26 22:26:45 UTC (rev 9284)
@@ -7,28 +7,5 @@
# Remove "Lackey, ..." line and the following copyright line.
sed "/^Lackey, an example Valgrind tool./ , /./ d" |
-# Output looks like this...
-#
-# Counted 53 calls to _dl_runtime_resolve()
-#
-# Executed:
-# BBs: 47131
-# x86 instrs: 193330
-# UInstrs: 523996
-#
-# Jccs:
-# total: 36368
-# % taken: 58%
-#
-# Ratios:
-# x86 instrs : BB = 41 : 10
-# UInstrs : BB = 111 : 10
-# UInstrs : x86_instr = 27 : 10
-#
-# Exit code: 0
-#
-# ...so chop all lines between first and last (inclusive)
-sed "/^Counted [0-9]\+ calls to _dl_runtime_resolve()$/ , \
- /UInstrs : x86_instrs = [0-9]\+ : [0-9]\+/ \
- d"
-
+# Filter all the numbers.
+../../tests/filter_numbers
Modified: trunk/lackey/tests/true.stderr.exp
===================================================================
--- trunk/lackey/tests/true.stderr.exp 2009-02-26 22:25:10 UTC (rev 9283)
+++ trunk/lackey/tests/true.stderr.exp 2009-02-26 22:26:45 UTC (rev 9284)
@@ -1,2 +1,20 @@
+Counted ... calls to _dl_runtime_resolve()
+
+Jccs:
+ total: ...
+ taken: ... ( ...%)
+
+Executed:
+ SBs entered: ...
+ SBs completed: ...
+ guest instrs: ...
+ IRStmts: ...
+
+Ratios:
+ guest instrs : SB entered = ... : ...
+ IRStmts : SB entered = ... : ...
+ IRStmts : guest instr = ... : ...
+
+Exit code: ...
Modified: trunk/tests/filter_numbers
===================================================================
--- trunk/tests/filter_numbers 2009-02-26 22:25:10 UTC (rev 9283)
+++ trunk/tests/filter_numbers 2009-02-26 22:26:45 UTC (rev 9284)
@@ -1,3 +1,3 @@
#!/bin/sh
-sed 's/[0-9]*/./'
+perl -p -e 's/[0-9,]+/.../g'
|