diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-09-06 10:09:26 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-09-06 10:09:26 -0400 |
| commit | 1446b65dbd2d023a54675277f157ab661bc06474 (patch) | |
| tree | 3e90f0718d3d3a18ac0a091e763f03c651b8f501 /testsuite/systemtap.base | |
| parent | a80aa597e9d6fa3443a8f5a1c049422f909c85bb (diff) | |
| parent | e071e49b06c2fe9e20c15ec3719cbaa60ae4afe1 (diff) | |
| download | systemtap-steved-1446b65dbd2d023a54675277f157ab661bc06474.tar.gz systemtap-steved-1446b65dbd2d023a54675277f157ab661bc06474.tar.xz systemtap-steved-1446b65dbd2d023a54675277f157ab661bc06474.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
* 'master' of ssh://sources.redhat.com/git/systemtap:
Handle scalar statistics.
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/global_end.exp | 3 | ||||
| -rw-r--r-- | testsuite/systemtap.base/global_end.stp | 7 |
2 files changed, 8 insertions, 2 deletions
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 |