summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhunt <hunt>2006-10-30 15:12:48 +0000
committerhunt <hunt>2006-10-30 15:12:48 +0000
commitb3481c14e523c266c29e97345899b72cd73dee7b (patch)
treeb6af8c72b3e7508e6a55f5e968a2c6e4fe675639
parenta23b37425197e995abc7d52aa4ec70a6890ea729 (diff)
downloadsystemtap-steved-b3481c14e523c266c29e97345899b72cd73dee7b.tar.gz
systemtap-steved-b3481c14e523c266c29e97345899b72cd73dee7b.tar.xz
systemtap-steved-b3481c14e523c266c29e97345899b72cd73dee7b.zip
2006-10-30 Martin Hunt <hunt@redhat.com>
* systemtap.base/cache.exp (stap_compile): Fix a simple buffering problem with expect.
-rw-r--r--testsuite/ChangeLog5
-rw-r--r--testsuite/systemtap.base/cache.exp2
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index b4733d61..7ac1f2f2 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-30 Martin Hunt <hunt@redhat.com>
+
+ * systemtap.base/cache.exp (stap_compile): Fix a simple
+ buffering problem with expect.
+
2006-10-26 David Smith <dsmith@redhat.com>
* systemtap.base/cache.exp: New file that tests caching
diff --git a/testsuite/systemtap.base/cache.exp b/testsuite/systemtap.base/cache.exp
index 3d87c314..7308fafc 100644
--- a/testsuite/systemtap.base/cache.exp
+++ b/testsuite/systemtap.base/cache.exp
@@ -28,7 +28,7 @@ proc stap_compile { TEST_NAME flags script args } {
set compile_errors 0
expect {
-re {^Pass\ [1234]:[^\r]*\ in\ .*\ ms.\r\n} {exp_continue}
- -re {^Pass\ [34]: using cached .+\r\n} {incr cached 1; exp_continue}
+ -re {^Pass\ [34]: using cached [^\r\n]+\r\n} {incr cached 1; exp_continue}
-re "compilation failed" {incr compile_errors 1; exp_continue}
-re "semantic error:" {incr compile_errors 1; exp_continue}
}