summaryrefslogtreecommitdiffstats
path: root/testsuite
diff options
context:
space:
mode:
authorFrank Ch. Eigler <fche@elastic.org>2008-06-16 17:57:20 -0400
committerFrank Ch. Eigler <fche@elastic.org>2008-06-16 17:57:20 -0400
commitcfd621bc5bffb042aade8c6ec2d5b1b38cc58f5a (patch)
treeeb4dd1a1bcc05803cc4216ad0efddd4467cf66ed /testsuite
parent6643650db25f9ea5b32fe767b4f09e2b6d91a7c4 (diff)
downloadsystemtap-steved-cfd621bc5bffb042aade8c6ec2d5b1b38cc58f5a.tar.gz
systemtap-steved-cfd621bc5bffb042aade8c6ec2d5b1b38cc58f5a.tar.xz
systemtap-steved-cfd621bc5bffb042aade8c6ec2d5b1b38cc58f5a.zip
warning/error message compaction by removing duplicated token file names
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/ChangeLog5
-rw-r--r--testsuite/systemtap.base/warnings.exp2
-rw-r--r--testsuite/systemtap.base/warnings.stp1
3 files changed, 6 insertions, 2 deletions
diff --git a/testsuite/ChangeLog b/testsuite/ChangeLog
index fd5a4c8f..0dd36d7a 100644
--- a/testsuite/ChangeLog
+++ b/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-06-16 Frank Ch. Eigler <fche@elastic.org>
+
+ * systemtap.base/warnings.exp: Adjust warning count again (me1 and
+ elide were formerly duplicated).
+
2008-06-16 Stan Cox <scox@redhat.com>
* systemtap.base/warnings.stp: Added PR 6611 warning tests.
diff --git a/testsuite/systemtap.base/warnings.exp b/testsuite/systemtap.base/warnings.exp
index 3e37553f..b56d7a98 100644
--- a/testsuite/systemtap.base/warnings.exp
+++ b/testsuite/systemtap.base/warnings.exp
@@ -9,7 +9,7 @@ expect {
eof { }
}
wait
-if {$ok == 16} {
+if {$ok == 14} {
pass $test
} else {
fail "$test ($ok)"
diff --git a/testsuite/systemtap.base/warnings.stp b/testsuite/systemtap.base/warnings.stp
index 314e45f7..94ed57b3 100644
--- a/testsuite/systemtap.base/warnings.stp
+++ b/testsuite/systemtap.base/warnings.stp
@@ -15,4 +15,3 @@ probe probea { printf("%d", funcb(2,3)); printf("%s",var) }
function funcb(a:long, b:long) {return a + b}
function funca(a:long) {a=b; elide_me7=1; return a}
-