diff options
| author | Frank Ch. Eigler <fche@elastic.org> | 2008-03-28 12:34:05 -0400 |
|---|---|---|
| committer | Frank Ch. Eigler <fche@elastic.org> | 2008-03-28 12:34:05 -0400 |
| commit | 5e5189b38b0b1b788d32190361961d18e4456ae6 (patch) | |
| tree | d388205113589bf73857efc6ef997bc8c39e112b /testsuite/lib | |
| parent | bf6c85c35a749ca8cc6bea20a7774d063c218938 (diff) | |
| parent | 1e00cfb1b6caa8b8ac343fac8e3d08f2d6a5d785 (diff) | |
| download | systemtap-steved-5e5189b38b0b1b788d32190361961d18e4456ae6.tar.gz systemtap-steved-5e5189b38b0b1b788d32190361961d18e4456ae6.tar.xz systemtap-steved-5e5189b38b0b1b788d32190361961d18e4456ae6.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
* 'master' of git://sources.redhat.com/git/systemtap: (24 commits)
2008-03-27 Frank Ch. Eigler <fche@elastic.org>
2008-03-27 Frank Ch. Eigler <fche@elastic.org>
2008-03-26 Frank Ch. Eigler <fche@elastic.org>
Revert "dummy commit"
dummy commit
* clarify utility of epilogue-type probe aliases in documentation
2008-03-23 Frank Ch. Eigler <fche@elastic.org>
2008-03-23 Frank Ch. Eigler <fche@elastic.org>
2008-03-21 Eugene Teo <eugeneteo@kernel.sg>
spelling fixes
2008-03-20 Frank Ch. Eigler <fche@elastic.org>
* clarify $variables available in .return probes
2008-03-20 Frank Ch. Eigler <fche@elastic.org>
2008-03-17 Eugene Teo <eteo@redhat.com>
* systemtap.base/maxactive.exp, probefunc.exp: Standardize pass msg.
2008-03-14 Masami Hiramatsu <mhiramat@redhat.com>
2008-03-13 Frank Ch. Eigler <fche@elastic.org>
* release prep: 0.6.2 version bump
2008-03-12 Dave Brolley <brolley@redhat.com>
2008-03-11 Will Cohen <wcohen@redhat.com>
...
Diffstat (limited to 'testsuite/lib')
| -rw-r--r-- | testsuite/lib/stap_run.exp | 14 | ||||
| -rw-r--r-- | testsuite/lib/systemtap.exp | 5 |
2 files changed, 14 insertions, 5 deletions
diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index c2b4e74d..42efa4f8 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -34,6 +34,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } expect { -timeout 180 -re {^Warning: using '-m' disables cache support.\r\n} {exp_continue} + -re {^WARNING: cannot find module [^\r]*DWARF[^\r]*\r\n} {exp_continue} -re {^Pass\ ([1234]):[^\r]*\ in\ ([0-9]+)usr/([0-9]+)sys/([0-9]+)real\ ms\.\r\n} {set pass$expect_out(1,string) "\t$expect_out(2,string)\t$expect_out(3,string)\t$expect_out(4,string)"; exp_continue} -re {^Pass\ ([34]): using cached [^\r]+\r\n} @@ -73,15 +74,22 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } set skipped_probes $expect_out(2,string)} } } - timeout { fail "$TEST_NAME shutdown (timeout)" } + timeout { + fail "$TEST_NAME shutdown (timeout)" + exec kill -INT -[exp_pid] + } eof { fail "$TEST_NAME shutdown (eof)" } } } -re "semantic error:" { fail "$TEST_NAME compilation" } - timeout { fail "$TEST_NAME startup (timeout)" - exec kill -INT [exp_pid] } + timeout { + fail "$TEST_NAME startup (timeout)" + exec kill -INT -[exp_pid] + } eof { fail "$TEST_NAME startup (eof)" } } + # again for good measure + exec kill -INT -[exp_pid] catch close wait } diff --git a/testsuite/lib/systemtap.exp b/testsuite/lib/systemtap.exp index baed0e41..d458e98f 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -58,8 +58,9 @@ proc get_system_info {} { } elseif [file exists $env(SRCDIR)/../SNAPSHOT] { set Snapshot [exec /bin/cat $env(SRCDIR)/../SNAPSHOT] } else { - set Snapshot "unknown" - } + regexp {version [^)]*} [exec stap -V 2>@ stdout] version + set Snapshot $version + } set Distro "Linux" if [file exists /etc/fedora-release] {set Distro [exec /bin/cat /etc/fedora-release]} if [file exists /etc/redhat-release] {set Distro [exec /bin/cat /etc/redhat-release]} |