diff options
Diffstat (limited to 'testsuite')
| -rw-r--r-- | testsuite/ChangeLog | 11 | ||||
| -rw-r--r-- | testsuite/lib/stap_run.exp | 11 | ||||
| -rwxr-xr-x | testsuite/systemtap.syscall/alarm.c | 12 | ||||
| -rw-r--r-- | testsuite/systemtap.syscall/stat.c | 9 |
4 files changed, 39 insertions, 4 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog index 42de95f4..d8d26ce9 100644 --- a/testsuite/ChangeLog +++ b/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2008-01-09 Masami Hiramatsu <mhiramat@redhat.com> + + PR5554 + * systemtap.syscall/alarm.c: Fix expected output patterns on ia64. + * systemtap.syscall/stat.c: Ditto. + +2008-01-09 Masami Hiramatsu <mhiramat@redhat.com> + + PR5544 + * lib/stap_run.exp (stap_run): Support warning before ending probe. + 2008-01-07 William Cohen <wcohen@redhat.com> * lib/systemtap.exp (as_root): new proc. * systemtap.context/context.exp: diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index c9131562..5bd1549c 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -22,6 +22,7 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } # initialize probe_errors and skipped_probes to 0 set probe_errors 0 set skipped_probes 0 + set warning_regexp {^WARNING: Number of errors: ([0-9]+), skipped probes: ([0-9]+)\r\n} if {[info procs installtest_p] != "" && ![installtest_p]} { untested $TEST_NAME; return } @@ -56,6 +57,10 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } expect { -timeout 20 + -re $warning_regexp { + set probe_errors $expect_out(1,string) + set skipped_probes $expect_out(2,string) + exp_continue} -re $output { pass "$TEST_NAME shutdown and output" expect { @@ -63,9 +68,9 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } -re {^Pass\ ([5]):[^\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)" verbose -log "metric:\t$TEST_NAME $pass1$pass2$pass3$pass4$pass5"} - -re {^WARNING: Number of errors: ([0-9]+), skipped probes: ([0-9]+)\r\n} - {set probe_errors $expect_out(1,string) - set skipped_probes $expect_out(2,string)} + -re $warning_regexp { + set probe_errors $expect_out(1,string) + set skipped_probes $expect_out(2,string)} } } timeout { fail "$TEST_NAME shutdown (timeout)" } diff --git a/testsuite/systemtap.syscall/alarm.c b/testsuite/systemtap.syscall/alarm.c index bae92253..7cb17164 100755 --- a/testsuite/systemtap.syscall/alarm.c +++ b/testsuite/systemtap.syscall/alarm.c @@ -19,13 +19,25 @@ int main() sigaction(SIGALRM, &sigrt_act, NULL); alarm(1); +#ifdef __ia64__ + // setitimer (ITIMER_REAL, \[0.000000,1.000000\], XXXX) = 0 +#else // alarm (1) = 0 +#endif pause(); +#ifdef __ia64__ + // rt_sigsuspend () = +#else // pause () = +#endif alarm(0); +#ifdef __ia64__ + // setitimer (ITIMER_REAL, \[0.000000,0.000000\], XXXX) = 0 +#else // alarm (0) = 0 +#endif sleep(1); // nanosleep (\[1.000000000\], XXXX) = 0 diff --git a/testsuite/systemtap.syscall/stat.c b/testsuite/systemtap.syscall/stat.c index 1b31d816..deade3e0 100644 --- a/testsuite/systemtap.syscall/stat.c +++ b/testsuite/systemtap.syscall/stat.c @@ -36,12 +36,19 @@ int main() ubuf.actime = 1; ubuf.modtime = 1135641600; utime("foobar", &ubuf); +#ifdef __ia64__ + // utimes ("foobar", \[1.000000\]\[1135641600.000000\]) = +#else // utime ("foobar", \[1970/01/01-00:00:01, 2005/12/27-00:00:00\]) = 0 +#endif ubuf.actime = 1135690000; ubuf.modtime = 1135700000; utime("foobar", &ubuf); +#ifdef __ia64__ + // utimes ("foobar", \[1135690000.000000\]\[1135700000.000000\]) = +#else // utime ("foobar", \[2005/12/27-13:26:40, 2005/12/27-16:13:20\]) = 0 - +#endif return 0; } |