summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorRajan Arora <rarora@redhat.com>2008-10-09 19:58:30 -0400
committerRajan Arora <rarora@redhat.com>2008-10-09 19:58:30 -0400
commit1b1b4cebda9ceaa7a2a2b695a32ecb2588045076 (patch)
treed40f4da6cd854250b2523ddc5ab0563efef050d7 /testsuite
parente2607b19ce56830d64affed6a8ab169697bf2ccf (diff)
downloadsystemtap-steved-1b1b4cebda9ceaa7a2a2b695a32ecb2588045076.tar.gz
systemtap-steved-1b1b4cebda9ceaa7a2a2b695a32ecb2588045076.tar.xz
systemtap-steved-1b1b4cebda9ceaa7a2a2b695a32ecb2588045076.zip
Display source context for error and warning messages (6701)
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/ChangeLog5
-rwxr-xr-xtestsuite/parseko/source_context.stp5
-rw-r--r--testsuite/systemtap.base/warnings.exp2
3 files changed, 12 insertions, 0 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index 5ddee32c..ceef8c40 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-10-09 Rajan Arora <rarora@redhat.com>
+
+ * systemtap.base/warnings.exp: Allow for source: lines.
+ * parseko/source_context.stp: New file.
+
2008-10-04 Mark Wielaard <mjw@redhat.com>
* systemtap.base/debugpath.exp: Guess a bit more intelligently
diff --git a/testsuite/parseko/source_context.stp b/testsuite/parseko/source_context.stp
new file mode 100755
index 00000000..403b203b
--- /dev/null
+++ b/testsuite/parseko/source_context.stp
@@ -0,0 +1,5 @@
+probe timer.ms(123)
+{
+printf("Probe successful\n")
+ eeexit ()
+}
diff --git a/testsuite/systemtap.base/warnings.exp b/testsuite/systemtap.base/warnings.exp
index a90860d9..4bbef40d 100644
--- a/testsuite/systemtap.base/warnings.exp
+++ b/testsuite/systemtap.base/warnings.exp
@@ -6,6 +6,8 @@ expect {
-timeout 30
-re {^WARNING:[^\r\n]*\r\n} { incr ok; exp_continue }
-re {^[^\r\n]*.ko\r\n} { incr ok; exp_continue }
+ -re {^[^\r]*source:[^\r\n]*\r\n} {exp_continue}
+ -re {^[^\r\n]*\^[^\r\n]*\r\n} {exp_continue}
timeout { fail "$test (timeout)" }
eof { }
}