From 1d4cb9b5f957bd3825fd1f0cfa1df1c24a07164d Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mjw@redhat.com>
Date: Sun, 8 Mar 2009 23:23:35 +0100
Subject: Make stap_run2 count exact number of lines.

* testsuite/lib/stap_run2.exp: Compare found and expected number of lines.
* testsuite/systemtap.*/*.exp (result_string): Make number of lines exact.
---
 testsuite/systemtap.string/dot.exp     | 3 +--
 testsuite/systemtap.string/isinstr.exp | 3 +--
 testsuite/systemtap.string/sprint.exp  | 3 +--
 testsuite/systemtap.string/strlen.exp  | 3 +--
 testsuite/systemtap.string/strtol.exp  | 3 +--
 testsuite/systemtap.string/substr.exp  | 3 +--
 6 files changed, 6 insertions(+), 12 deletions(-)

(limited to 'testsuite/systemtap.string')

diff --git a/testsuite/systemtap.string/dot.exp b/testsuite/systemtap.string/dot.exp
index b1d38172..14f329db 100644
--- a/testsuite/systemtap.string/dot.exp
+++ b/testsuite/systemtap.string/dot.exp
@@ -5,6 +5,5 @@ helloworld
 0
 100
 -42
-66
-}
+66}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.string/isinstr.exp b/testsuite/systemtap.string/isinstr.exp
index 986043e8..ed0474de 100644
--- a/testsuite/systemtap.string/isinstr.exp
+++ b/testsuite/systemtap.string/isinstr.exp
@@ -1,6 +1,5 @@
 set test "isinstr"
 set ::result_string {"foo" is in "abcfoobad"
 "foo" is NOT in "abcdefg"
-"" is in ""
-}
+"" is in ""}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.string/sprint.exp b/testsuite/systemtap.string/sprint.exp
index c8f9826a..b4f0b453 100644
--- a/testsuite/systemtap.string/sprint.exp
+++ b/testsuite/systemtap.string/sprint.exp
@@ -3,6 +3,5 @@ set ::result_string {helloworld
 helloworld
 EQUAL
 EQUAL
-hello-world helloworld FOO helloworld
-}
+hello-world helloworld FOO helloworld}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.string/strlen.exp b/testsuite/systemtap.string/strlen.exp
index 40c790fe..b93564ef 100644
--- a/testsuite/systemtap.string/strlen.exp
+++ b/testsuite/systemtap.string/strlen.exp
@@ -2,6 +2,5 @@ set test "strlen"
 set ::result_string {strlen("") = 0
 strlen("1") = 1
 strlen("0123456789") = 10
-strlen("012345678901234567890123456789012345678901234567890123456789012") = 63
-}
+strlen("012345678901234567890123456789012345678901234567890123456789012") = 63}
 stap_run2 $srcdir/$subdir/$test.stp -DMAXSTRINGLEN=64
diff --git a/testsuite/systemtap.string/strtol.exp b/testsuite/systemtap.string/strtol.exp
index 12d63f0d..25cc21a0 100644
--- a/testsuite/systemtap.string/strtol.exp
+++ b/testsuite/systemtap.string/strtol.exp
@@ -10,6 +10,5 @@ set ::result_string {1
 1000
 4096
 512
-8
-0}
+8}
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.string/substr.exp b/testsuite/systemtap.string/substr.exp
index c9884935..5f1b662b 100644
--- a/testsuite/systemtap.string/substr.exp
+++ b/testsuite/systemtap.string/substr.exp
@@ -13,6 +13,5 @@ set ::result_string {Hello World!
 12,1: 
 0,10: Hello Worl
 0,100: Hello World!
-0,100000: Hello World!
-}
+0,100000: Hello World!}
 stap_run2 $srcdir/$subdir/$test.stp
-- 
cgit