summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/ChangeLog5
-rw-r--r--testsuite/systemtap.base/global_end.exp4
-rw-r--r--testsuite/systemtap.base/global_end.stp11
3 files changed, 18 insertions, 2 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index a0e19521..26573fcb 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01 Stan Cox <scox@redhat.com>
+
+ * systemtap.base/global_end.stp: Also check statistics.
+ * systemtap.base/global_end.exp: Likewise.
+
2008-08-29 David Smith <dsmith@redhat.com>
PR6841
diff --git a/testsuite/systemtap.base/global_end.exp b/testsuite/systemtap.base/global_end.exp
index 08cf0dea..d066cf9d 100644
--- a/testsuite/systemtap.base/global_end.exp
+++ b/testsuite/systemtap.base/global_end.exp
@@ -16,8 +16,10 @@ expect {
-re {gamma="abcdefghijklmnopqrstuvwxyz"} { incr ok; exp_continue }
-re {iota."one".="eleven"} { incr ok; exp_continue }
-re {iota."two".="twelve"} { incr ok; exp_continue }
+ -re {epsilon."one",1. @count=0x4 @min=0x1 @max=0x4 @sum=0xa @avg=0x2} { incr ok; exp_continue }
+ -re {epsilon."two",2. @count=0x4 @min=0xa @max=0x28 @sum=0x64 @avg=0x19} { incr ok; exp_continue }
timeout { fail "$test (timeout)" }
eof { }
}
wait
-if {$ok == 8} { pass "$test ($ok)" } { fail "$test ($ok)" }
+if {$ok == 10} { pass "$test ($ok)" } { fail "$test ($ok)" }
diff --git a/testsuite/systemtap.base/global_end.stp b/testsuite/systemtap.base/global_end.stp
index e9a1eb8f..b26b7c03 100644
--- a/testsuite/systemtap.base/global_end.stp
+++ b/testsuite/systemtap.base/global_end.stp
@@ -1,4 +1,4 @@
-global alpha, beta, gamma, iota
+global alpha, beta, gamma, iota, epsilon
probe begin {
gamma = "abcdefghijklmnopqrstuvwxyz"
@@ -15,6 +15,15 @@ probe begin {
beta["one",2] = 2
beta["two",1] = 3
beta["two",2] = 4
+
+ epsilon["one",1] <<< 1
+ epsilon["one",1] <<< 2
+ epsilon["one",1] <<< 3
+ epsilon["one",1] <<< 4
+ epsilon["two",2] <<< 10
+ epsilon["two",2] <<< 20
+ epsilon["two",2] <<< 30
+ epsilon["two",2] <<< 40
}
probe timer.ms(2000) {