Unused global variables display in guru mode fix (rh bz 468139)

diff --git a/ChangeLog b/ChangeLog
index 87688620888a746f784f41b61611e07576bd597c..ab118e1661a753df1a5ac61382b78840f2d7acef 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 e4251f2aef1100e554d5ad452e95e7a92e5601bb..38ce014e7aba24bf880d9fedc383a6d56b0c51fc 100644 (file)
--- 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 2ec0fb0ebf68ab79d0397e86b6c10c07bb3aeb31..6ded11379d2ce62e43aa8a5ec941cf718a70dc18 100644 (file)
--- 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 b6b9fd30fd4b7ffad4d34c837967281b902c9a0d..9935629efa0a273da0fbbcc959c11db81612f5fb 100644 (file)
--- 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)" }