diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 18 | ||||
| -rwxr-xr-x | testsuite/buildok/conversions-embedded.stp | 13 | ||||
| -rwxr-xr-x | testsuite/buildok/conversions.stp | 13 | ||||
| -rw-r--r-- | testsuite/lib/stap_run.exp | 14 | ||||
| -rw-r--r-- | testsuite/lib/systemtap.exp | 5 | ||||
| -rw-r--r-- | testsuite/systemtap.stress/conversions.stp | 12 |
6 files changed, 5 insertions, 70 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index a54e80bd..16f7af57 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,21 +1,3 @@ -2008-03-23 Frank Ch. Eigler <fche@elastic.org> - - * lib/stap_run.exp (stap_run): Ignore missing debuginfo warnings. - Try harder to kill stap child in case of timeouts and errors. - -2008-03-23 Frank Ch. Eigler <fche@elastic.org> - - PR 5980. - * lib/systemtap.exp: Set default Snapshot: value from "stap -V" - output. - -2008-03-21 Eugene Teo <eugeneteo@kernel.sg> - - PR 5528 - * systemtap.stress/conversions.stp: Test new user_* functions. - * buildok/conversions.stp: Test new user_* functions. - * buildok/conversions-embedded.stp: Test new user_* functions. - 2008-03-20 Frank Ch. Eigler <fche@elastic.org> PR 5956. diff --git a/testsuite/buildok/conversions-embedded.stp b/testsuite/buildok/conversions-embedded.stp index 55f6cdb7..7aa5a0b4 100755 --- a/testsuite/buildok/conversions-embedded.stp +++ b/testsuite/buildok/conversions-embedded.stp @@ -9,18 +9,5 @@ probe begin { print (user_string2 (0, "")) print (user_string_warn (0)) print (user_string_quoted (0)) - - print (user_string_n(0, 5)) - print (user_string_n2(0, 5, "foobar")) - print (user_string_n_warn(0, 0)) - print (user_string_n_quoted(0, 0)) - print (user_short(0)) - print (user_short_warn(0)) - print (user_int(0)) - print (user_int_warn(0)) - print (user_long(0)) - print (user_long_warn(0)) - print (user_char(0)) - print (user_char_warn(0)) } diff --git a/testsuite/buildok/conversions.stp b/testsuite/buildok/conversions.stp index 5f151f1d..e83bd968 100755 --- a/testsuite/buildok/conversions.stp +++ b/testsuite/buildok/conversions.stp @@ -12,17 +12,4 @@ probe begin { print (user_string(2342)) print (user_string2(2342,"foobar")) print (user_string_warn(2342)) - - print (user_string_n(2342, 5)) - print (user_string_n2(2342, 5, "foobar")) - print (user_string_n_warn(2342, 5)) - print (user_string_n_quoted(2342, 5)) - print (user_short(2342)) - print (user_short_warn(2342)) - print (user_int(2342)) - print (user_int_warn(2342)) - print (user_long(2342)) - print (user_long_warn(2342)) - print (user_char(2342)) - print (user_char_warn(2342)) } diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index 42efa4f8..c2b4e74d 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -34,7 +34,6 @@ 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} @@ -74,22 +73,15 @@ 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)" - exec kill -INT -[exp_pid] - } + timeout { fail "$TEST_NAME shutdown (timeout)" } 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 d458e98f..baed0e41 100644 --- a/testsuite/lib/systemtap.exp +++ b/testsuite/lib/systemtap.exp @@ -58,9 +58,8 @@ proc get_system_info {} { } elseif [file exists $env(SRCDIR)/../SNAPSHOT] { set Snapshot [exec /bin/cat $env(SRCDIR)/../SNAPSHOT] } else { - regexp {version [^)]*} [exec stap -V 2>@ stdout] version - set Snapshot $version - } + set Snapshot "unknown" + } 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]} diff --git a/testsuite/systemtap.stress/conversions.stp b/testsuite/systemtap.stress/conversions.stp index 34bd0c28..07795a6d 100644 --- a/testsuite/systemtap.stress/conversions.stp +++ b/testsuite/systemtap.stress/conversions.stp @@ -13,16 +13,4 @@ probe begin { print (user_string ($1)) } probe begin { print (user_string2 ($1,"<only suspected, not known>")) } probe begin { print (user_string_warn ($1)) } probe begin { print (user_string_quoted ($1)) } -probe begin { print (user_string_n ($1, 5)) } -probe begin { print (user_string_n2 ($1, 5, "<only suspected, not known>")) } -probe begin { print (user_string_n_warn ($1, 5)) } -probe begin { print (user_string_n_quoted ($1, 5)) } -probe begin { print (user_short ($1)) } -probe begin { print (user_short_warn ($1)) } -probe begin { print (user_int ($1)) } -probe begin { print (user_int_warn ($1)) } -probe begin { print (user_long ($1)) } -probe begin { print (user_long_warn ($1)) } -probe begin { print (user_char ($1)) } -probe begin { print (user_char_warn ($1)) } probe begin(1) { print ("\n") exit () } |