diff options
| author | hunt <hunt> | 2007-06-18 16:33:03 +0000 |
|---|---|---|
| committer | hunt <hunt> | 2007-06-18 16:33:03 +0000 |
| commit | 59cbc061bc3f155222a3ce640217834a4148aa41 (patch) | |
| tree | c62d46f4defd5f15201c952b3ab10842abeb1797 /testsuite/systemtap.base/cache.exp | |
| parent | 6b159469f0daab2bc463c7ffbd3660b11c25ec22 (diff) | |
| download | systemtap-steved-59cbc061bc3f155222a3ce640217834a4148aa41.tar.gz systemtap-steved-59cbc061bc3f155222a3ce640217834a4148aa41.tar.xz systemtap-steved-59cbc061bc3f155222a3ce640217834a4148aa41.zip | |
2007-06-18 Martin Hunt <hunt@redhat.com>
From Quentin Barnes.
* lib/stap_run.exp, lib/stap_run2.exp, lib/systemtap.exp,
systemtap.base/cache.exp, systemtap.base/optim.exp,
systemtap.base/overload.exp, systemtap.base/prologues.exp,
systemtap.maps/absentstats.exp, systemtap.maps/foreach_fail.exp,
systemtap.maps/ix_clear*.exp, systemtap.maps/pmap_agg_overflow.exp,
systemtap.samples/args.exp, systemtap.samples/arith.exp,
systemtap.samples/arith_limits.exp,
systemtap.samples/control_limits.exp, systemtap.samples/lket.exp,
systemtap.samples/pfaults.exp, systemtap.samples/poll_map.exp,
systemtap.samples/primes.exp, systemtap.samples/profile.exp,
systemtap.samples/queue_demo.exp, systemtap.samples/symbols.exp,
systemtap.samples/syscalls1.exp, systemtap.samples/syscalls2.exp,
systemtap.samples/transport.exp: Small fixes to patterns, plus
fix timeouts for slower systems.
Diffstat (limited to 'testsuite/systemtap.base/cache.exp')
| -rw-r--r-- | testsuite/systemtap.base/cache.exp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp index 04da509b..c8084ec9 100644 --- a/testsuite/systemtap.base/cache.exp +++ b/testsuite/systemtap.base/cache.exp @@ -27,12 +27,14 @@ proc stap_compile { TEST_NAME flags script args } { set cached 0 set compile_errors 0 expect { - -re {^Pass\ [1234]:[^\r]*\ in\ .*\ ms.\r\n} {exp_continue} + -timeout 180 + -re {^Pass\ [1234]:[^\r]*\ in\ [^\r]*\ ms\.\r\n} {exp_continue} -re {^Pass\ [34]: using cached [^\r\n]+\r\n} {incr cached 1; exp_continue} # pass-4 output - -re {^/[^\r\n]+.ko\r\n} {exp_continue} + -re {^/[^\r\n]+\.ko\r\n} {exp_continue} -re "compilation failed" {incr compile_errors 1; exp_continue} -re "semantic error:" {incr compile_errors 1; exp_continue} + timeout { fail "$TEST_NAME (timeout)" } } catch close wait |