summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorDave Brolley <brolley@redhat.com>2009-01-09 15:19:39 -0500
committerDave Brolley <brolley@redhat.com>2009-01-09 15:19:39 -0500
commit90341d42c4a077c15236e233951472eeeac455f1 (patch)
treeff38a1490bffeb49e9be70e06dd24f6fabde41b0 /testsuite
parent64aa100f39dca60999028f83feb31983728ea4d4 (diff)
parentaa5951be9f4f12139cdcec4a501754a62b88c28b (diff)
downloadsystemtap-steved-90341d42c4a077c15236e233951472eeeac455f1.tar.gz
systemtap-steved-90341d42c4a077c15236e233951472eeeac455f1.tar.xz
systemtap-steved-90341d42c4a077c15236e233951472eeeac455f1.zip
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Conflicts: ChangeLog Makefile.am Makefile.in testsuite/ChangeLog
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/ChangeLog5
-rw-r--r--testsuite/systemtap.context/backtrace.tcl2
2 files changed, 6 insertions, 1 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 293c007f..27cd27b5 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -2,6 +2,11 @@
* lib/systemtap.exp: Remove ssl_server_path and ssl_client_path.
+2009-01-06 Frank Ch. Eigler <fche@elastic.org>
+
+ PR 9699:
+ * systemtap.context/backtrace.tcl: Correct tcl syntax in fail message.
+
2008-12-24 Dave Brolley <brolley@redhat.com>
* lib/systemtap.exp: Rename client_path to net_path.
diff --git a/testsuite/systemtap.context/backtrace.tcl b/testsuite/systemtap.context/backtrace.tcl
index aaec4cb8..ca60c369 100644
--- a/testsuite/systemtap.context/backtrace.tcl
+++ b/testsuite/systemtap.context/backtrace.tcl
@@ -128,7 +128,7 @@ expect {
}
exp_continue
}
- eof {fail "backtrace of yyy_func[2-4]: unexpected EOF" }
+ eof {fail "backtrace of yyy_func*: unexpected EOF" }
}
exec kill -INT -[exp_pid]
if {$m1 == 3} {