diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-06-29 12:24:53 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-06-29 12:24:53 -0400 |
| commit | b2b6260ce7093deb44a70835a38fd7199f0b0954 (patch) | |
| tree | 5417d4f380c975132e70221f70f37d2d92da0b02 /testsuite/systemtap.base | |
| parent | 67efafc24aa4e415a01674a0eff04abcb1c1165d (diff) | |
| parent | 2fd285e65eb8e1f77cb5b70a1f81377896ad6b2c (diff) | |
| download | systemtap-steved-b2b6260ce7093deb44a70835a38fd7199f0b0954.tar.gz systemtap-steved-b2b6260ce7093deb44a70835a38fd7199f0b0954.tar.xz systemtap-steved-b2b6260ce7093deb44a70835a38fd7199f0b0954.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'testsuite/systemtap.base')
| -rw-r--r-- | testsuite/systemtap.base/strftime.exp | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/testsuite/systemtap.base/strftime.exp b/testsuite/systemtap.base/strftime.exp index ad9e471d..decd7a65 100644 --- a/testsuite/systemtap.base/strftime.exp +++ b/testsuite/systemtap.base/strftime.exp @@ -7,15 +7,9 @@ system "rm -f %*" set format %%%S_%T exec stap -o $format -we {probe begin {println("hello");exit()}} -spawn ls -1 -set ok 0 -expect { - -re {%([0-9][0-9])_[0-9][0-9]:[0-9][0-9]:\1} {incr ok} - eof { } -} -wait +set file [glob -nocomplain -types f %\[0-9\]\[0-9\]_\[0-9\]\[0-9\]:\[0-9\]\[0-9\]:\[0-9\]\[0-9\]] -if {$ok == 1} { +if {[llength $file] == 1} { pass "$test (%S and %T)" } else { fail "$test (%S and %T)" @@ -27,19 +21,8 @@ set format %%,%C,%Y,%y,%m,%d,%e,%F,%H,%I,%j,%k,%l,%M,%R,%u,%w set date1 [exec date +$format] # run stapio with strftime exec stap -o $format -we {probe begin {println("hello");exit()}} -# check whether stap outputs stapio pid -set date2 [exec date +$format] - -spawn ls -1 -set ok 0 -expect { - $date1 {incr ok} - $date2 {incr ok} - eof { } -} -wait -if {$ok == 1} { +if {[file exists $date1]} { pass "$test (except %S and %T)" } else { fail "$test (except %S and %T)" |