diff options
| author | Stan Cox <scox@redhat.com> | 2008-09-05 19:00:17 -0400 |
|---|---|---|
| committer | Stan Cox <scox@redhat.com> | 2008-09-05 19:00:17 -0400 |
| commit | e071e49b06c2fe9e20c15ec3719cbaa60ae4afe1 (patch) | |
| tree | c19de49d6c89c19d5d66fb913c0c7e256cbf460f /testsuite | |
| parent | 40be866ffcfc21a15836643cc7c2437ed5c91e8f (diff) | |
| download | systemtap-steved-e071e49b06c2fe9e20c15ec3719cbaa60ae4afe1.tar.gz systemtap-steved-e071e49b06c2fe9e20c15ec3719cbaa60ae4afe1.tar.xz systemtap-steved-e071e49b06c2fe9e20c15ec3719cbaa60ae4afe1.zip | |
Handle scalar statistics.
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.base/global_end.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.base/global_end.stp | 7 |
3 files changed, 13 insertions, 2 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index ff907094..82435044 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2008-09-05 Stan Cox <scox@redhat.com> + + * systemtap.base/global_end.stp: Also check scalar statistics. + * systemtap.base/global_end.exp: Likeewise. + 2008-09-05 Frank Ch. Eigler <fche@elastic.org> PR 4255. diff --git a/testsuite/systemtap.base/global_end.exp b/testsuite/systemtap.base/global_end.exp index d066cf9d..cd5c6f83 100644 --- a/testsuite/systemtap.base/global_end.exp +++ b/testsuite/systemtap.base/global_end.exp @@ -18,8 +18,9 @@ expect { -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 } + -re {phi @count=0x4 @min=0x1 @max=0x4 @sum=0xa @avg=0x2} { incr ok; exp_continue } timeout { fail "$test (timeout)" } eof { } } wait -if {$ok == 10} { pass "$test ($ok)" } { fail "$test ($ok)" } +if {$ok == 11} { pass "$test ($ok)" } { fail "$test ($ok)" } diff --git a/testsuite/systemtap.base/global_end.stp b/testsuite/systemtap.base/global_end.stp index b26b7c03..876eac8c 100644 --- a/testsuite/systemtap.base/global_end.stp +++ b/testsuite/systemtap.base/global_end.stp @@ -1,4 +1,4 @@ -global alpha, beta, gamma, iota, epsilon +global alpha, beta, gamma, iota, epsilon, phi probe begin { gamma = "abcdefghijklmnopqrstuvwxyz" @@ -16,6 +16,11 @@ probe begin { beta["two",1] = 3 beta["two",2] = 4 + phi <<< 1 + phi <<< 2 + phi <<< 3 + phi <<< 4 + epsilon["one",1] <<< 1 epsilon["one",1] <<< 2 epsilon["one",1] <<< 3 |