From 0884d54a236c30dc2585a6b76e5846e44e54138d Mon Sep 17 00:00:00 2001 From: dsmith Date: Mon, 23 Oct 2006 22:08:42 +0000 Subject: 2006-10-23 David Smith * lib/stap_run.exp: Handles cached module. * lib/stap_run2.exp: Ditto. --- testsuite/lib/stap_run.exp | 2 ++ testsuite/lib/stap_run2.exp | 2 ++ 2 files changed, 4 insertions(+) (limited to 'testsuite/lib') diff --git a/testsuite/lib/stap_run.exp b/testsuite/lib/stap_run.exp index 2d378154..801f1265 100644 --- a/testsuite/lib/stap_run.exp +++ b/testsuite/lib/stap_run.exp @@ -24,6 +24,8 @@ proc stap_run { TEST_NAME {LOAD_GEN_FUNCTION ""} {OUTPUT_CHECK_STRING ""} args } expect { -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\n} + {set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue} -re {^Pass 5: starting run.\r\n} {exp_continue} -timeout 30 -re "^systemtap starting probe\r\n" { pass "$TEST_NAME startup" diff --git a/testsuite/lib/stap_run2.exp b/testsuite/lib/stap_run2.exp index ebda0d6d..d65e3874 100644 --- a/testsuite/lib/stap_run2.exp +++ b/testsuite/lib/stap_run2.exp @@ -26,6 +26,8 @@ proc stap_run2 { TEST_NAME args } { expect { -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\n} + {set pass$expect_out(1,string) "\t0\t0\t0"; exp_continue} -re {^Pass 5: starting run.\r\n} {exp_continue} -ex $output { pass "$TEST_NAME passed" -- cgit