RHBZ 468139 avoid display of tapset globals

2 files changed, 18 insertions, 1 deletions

diff --git a/testsuite/systemtap.base/global_end.exp b/testsuite/systemtap.base/global_end.exp
index b6b9fd30..9699b241 100644
--- a/testsuite/systemtap.base/global_end.exp
+++ b/testsuite/systemtap.base/global_end.exp
@@ -23,4 +23,13 @@ expect {
     eof { }
 }
 wait
-if {$ok == 11} { pass "$test ($ok)" } { fail "$test ($ok)" }
+
+spawn stap $srcdir/$subdir/global_end2.stp
+# above should not do any tapset global variable display so
+# ok should only change by 1
+expect {
+    -timeout 180
+    -re {Avg time = 6} { incr ok; exp_continue }
+}
+
+if {$ok == 12} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.base/global_end2.stp b/testsuite/systemtap.base/global_end2.stp
new file mode 100644
index 00000000..f170a8fe
--- /dev/null
+++ b/testsuite/systemtap.base/global_end2.stp
@@ -0,0 +1,8 @@
+probe begin {
+  qsq_start("test")
+  qs_wait("test")
+  qs_run("test")
+  qs_done("test")
+  log(sprintf("Avg time = %d", qsq_service_time("test", 1)))
+  exit()
+}