diff options
author | Rajan Arora <rarora@redhat.com> | 2008-10-25 19:21:34 -0400 |
---|---|---|
committer | Rajan Arora <rarora@redhat.com> | 2008-10-25 19:21:34 -0400 |
commit | 212a566e493f285d89ebcc08961f44485dc55db0 (patch) | |
tree | 46a1d3b35e46edaa5a8a34aa11aa330a82995484 | |
parent | d9d9f8523cb7fe27d778a04f6bcc3c7275df5db6 (diff) | |
download | systemtap-steved-212a566e493f285d89ebcc08961f44485dc55db0.tar.gz systemtap-steved-212a566e493f285d89ebcc08961f44485dc55db0.tar.xz systemtap-steved-212a566e493f285d89ebcc08961f44485dc55db0.zip |
Unused global variables display in guru mode fix (rh bz 468139)
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | elaborate.cxx | 3 | ||||
-rw-r--r-- | testsuite/ChangeLog | 7 | ||||
-rw-r--r-- | testsuite/systemtap.base/global_end.exp | 8 |
4 files changed, 19 insertions, 3 deletions
@@ -1,3 +1,7 @@ +2008-10-25 Rajan Arora <rarora@redhat.com> + + * elaborate.cxx (add_global_var_display): Added check for guru mode. + 2008-10-24 Josh Stone <joshua.i.stone@intel.com> * tapsets.cxx (hrtimer_derived_probe_group::emit_module_decls): Support diff --git a/elaborate.cxx b/elaborate.cxx index e4251f2a..38ce014e 100644 --- a/elaborate.cxx +++ b/elaborate.cxx @@ -1147,7 +1147,8 @@ semantic_pass_symbols (systemtap_session& s) // Keep unread global variables for probe end value display. void add_global_var_display (systemtap_session& s) { - if (s.listing_mode) return; // avoid end probe in listings_mode + if (s.listing_mode || s.guru_mode) return; // avoid end probe + //in listings_mode or guru_mode varuse_collecting_visitor vut; for (unsigned i=0; i<s.probes.size(); i++) diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 2ec0fb0e..6ded1137 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,4 +1,9 @@ -2008-10-20 Elliott Baron <ebaron@redhat.com> +2008-10-25 Rajan Arora <rarora@redhat.com> + + * systemtap.base/global_end.exp: Spawn test again + in guru mode. + +2008-10-20 Elliott Baron <ebaron@redhat.com> PR6851 * systemtap.printf/char1.exp: New test. diff --git a/testsuite/systemtap.base/global_end.exp b/testsuite/systemtap.base/global_end.exp index b6b9fd30..9935629e 100644 --- a/testsuite/systemtap.base/global_end.exp +++ b/testsuite/systemtap.base/global_end.exp @@ -23,4 +23,10 @@ expect { eof { } } wait -if {$ok == 11} { pass "$test ($ok)" } { fail "$test ($ok)" } +spawn stap -g $srcdir/$subdir/global_end.stp +# above should not do any global variable display so `ok' should only change by one +expect { + -timeout 180 + -re {one,0x1.*one,0x2.*two,0x1.*two,0x2} { incr ok; exp_continue } +} +if {$ok == 12} { pass "$test ($ok)" } { fail "$test ($ok)" } |