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.

19 files changed, 12 insertions, 31 deletions

diff --git a/testsuite/systemtap.maps/exists.exp b/testsuite/systemtap.maps/exists.exp
index ea043a6b..bbdac737 100755
--- a/testsuite/systemtap.maps/exists.exp
+++ b/testsuite/systemtap.maps/exists.exp
@@ -9,8 +9,7 @@ comlete list for b: [0,0] [1,10] [2,20] [3,30] [4,40] [5,50] [6,60] [7,70] [8,80
 [0,0] is still there
 emtpy string there
 hello there
-emtpy string still there
-}
+emtpy string still there}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/foreach_foreach.exp b/testsuite/systemtap.maps/foreach_foreach.exp
index f79d290a..07a2d871 100644
--- a/testsuite/systemtap.maps/foreach_foreach.exp
+++ b/testsuite/systemtap.maps/foreach_foreach.exp
@@ -114,8 +114,7 @@ bar[21] = 9261
 bar[22] = 10648
 bar[23] = 12167
 bar[24] = 13824
-foo[10] = 100
-}
+foo[10] = 100}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/foreach_limit.exp b/testsuite/systemtap.maps/foreach_limit.exp
index 97305c4b..4cc87ec8 100644
--- a/testsuite/systemtap.maps/foreach_limit.exp
+++ b/testsuite/systemtap.maps/foreach_limit.exp
@@ -94,8 +94,7 @@ bucket 69: 13
 bucket 70: 28
 loop had 71 iterations
 
-Done.
-}
+Done.}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/foreach_limit2.exp b/testsuite/systemtap.maps/foreach_limit2.exp
index 00696fe1..224a0aa7 100644
--- a/testsuite/systemtap.maps/foreach_limit2.exp
+++ b/testsuite/systemtap.maps/foreach_limit2.exp
@@ -82,8 +82,7 @@ agg_array[6]: count:2  sum:18  avg:9  min:6  max:12
 loop had 4 iterations
 x ended up as 5
 
-Done.
-}
+Done.}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/ii.exp b/testsuite/systemtap.maps/ii.exp
index f7ce95fb..1f4a972a 100644
--- a/testsuite/systemtap.maps/ii.exp
+++ b/testsuite/systemtap.maps/ii.exp
@@ -61,8 +61,7 @@ foo[6] = 91
 foo[7] = 140
 foo[8] = 204
 foo[9] = 285
-foo[10] = 385
-}
+foo[10] = 385}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/iiiiii.exp b/testsuite/systemtap.maps/iiiiii.exp
index 3c8dbaf0..aeddbbac 100644
--- a/testsuite/systemtap.maps/iiiiii.exp
+++ b/testsuite/systemtap.maps/iiiiii.exp
@@ -64,8 +64,7 @@ foo[1,1,0,1,1] = 4
 foo[1,1,1,0,0] = 3
 foo[1,1,1,0,1] = 4
 foo[1,1,1,1,0] = 4
-foo[1,1,1,1,1] = 5
-}
+foo[1,1,1,1,1] = 5}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/is.exp b/testsuite/systemtap.maps/is.exp
index 5dffb850..31e96e77 100644
--- a/testsuite/systemtap.maps/is.exp
+++ b/testsuite/systemtap.maps/is.exp
@@ -61,8 +61,7 @@ foo[6] = # 36
 foo[7] = # 49
 foo[8] = # 64
 foo[9] = # 81
-foo[10] = # 100
-}
+foo[10] = # 100}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/ix.exp b/testsuite/systemtap.maps/ix.exp
index 578e8e38..11de73c1 100644
--- a/testsuite/systemtap.maps/ix.exp
+++ b/testsuite/systemtap.maps/ix.exp
@@ -41,8 +41,7 @@ foo[9]: count:4  sum:117  avg:29  min:-2  max:100
 foo[10]: count:4  sum:118  avg:29  min:-2  max:100
 
 Run a quick foreach without sorting...
-complete sum of foo:1243
-}
+complete sum of foo:1243}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/linear.exp b/testsuite/systemtap.maps/linear.exp
index 5519ee11..23b5f871 100644
--- a/testsuite/systemtap.maps/linear.exp
+++ b/testsuite/systemtap.maps/linear.exp
@@ -38,7 +38,6 @@ value |-------------------------------------------------- count
  1400 |                                                     3
  1450 |                                                     3
  1500 |                                                     0
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.maps/linear_empty.exp b/testsuite/systemtap.maps/linear_empty.exp
index 88a53a31..922ff0b9 100644
--- a/testsuite/systemtap.maps/linear_empty.exp
+++ b/testsuite/systemtap.maps/linear_empty.exp
@@ -1,8 +1,7 @@
 # Test empty linear histogram
 
 set test "linear_empty"
-set ::result_string {count=0
-}
+set ::result_string {count=0}
 
 stap_run2 $srcdir/$subdir/$test.stp -w
 
diff --git a/testsuite/systemtap.maps/linear_large.exp b/testsuite/systemtap.maps/linear_large.exp
index 51df3c92..d2a03f0a 100644
--- a/testsuite/systemtap.maps/linear_large.exp
+++ b/testsuite/systemtap.maps/linear_large.exp
@@ -19,7 +19,6 @@ avg=1115333333
   900000000 |                                                   0
  1000000000 |@@@@                                               4
 >1000000000 |@                                                  1
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.maps/linear_large_neg.exp b/testsuite/systemtap.maps/linear_large_neg.exp
index bdffba7b..470414a3 100644
--- a/testsuite/systemtap.maps/linear_large_neg.exp
+++ b/testsuite/systemtap.maps/linear_large_neg.exp
@@ -19,7 +19,6 @@ avg=-1284615384
   -200000000 |                                                   0
   -100000000 |@@                                                 2
            0 |@                                                  1
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.maps/linear_over.exp b/testsuite/systemtap.maps/linear_over.exp
index 5b0fafa4..25eca1e1 100644
--- a/testsuite/systemtap.maps/linear_over.exp
+++ b/testsuite/systemtap.maps/linear_over.exp
@@ -10,7 +10,6 @@ value |-------------------------------------------------- count
    90 |                                                      0
   100 |                                                      0
  >100 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 9000
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
diff --git a/testsuite/systemtap.maps/linear_overunder.exp b/testsuite/systemtap.maps/linear_overunder.exp
index 80b74c72..e5275524 100644
--- a/testsuite/systemtap.maps/linear_overunder.exp
+++ b/testsuite/systemtap.maps/linear_overunder.exp
@@ -25,7 +25,6 @@ value |-------------------------------------------------- count
   950 |@                                                   27
  1000 |@                                                   23
 >1000 |@@@@@@@                                            102
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.maps/linear_under.exp b/testsuite/systemtap.maps/linear_under.exp
index 8efc45be..28d24886 100644
--- a/testsuite/systemtap.maps/linear_under.exp
+++ b/testsuite/systemtap.maps/linear_under.exp
@@ -10,7 +10,6 @@ value |-------------------------------------------------- count
 <1800 |@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@ 100
  1800 |                                                     0
  1900 |                                                     0
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp -DMAXACTION=10000
diff --git a/testsuite/systemtap.maps/log.exp b/testsuite/systemtap.maps/log.exp
index 2bc54a33..d19082b4 100644
--- a/testsuite/systemtap.maps/log.exp
+++ b/testsuite/systemtap.maps/log.exp
@@ -130,7 +130,6 @@ set ::result_string {               value |-------------------------------------
  1152921504606846976 |@                                                   1
  2305843009213693952 |@                                                   1
  4611686018427387904 |@                                                   1
-
 }
 
 stap_run2 $srcdir/$subdir/$test.stp
diff --git a/testsuite/systemtap.maps/log_edge.exp b/testsuite/systemtap.maps/log_edge.exp
index 051021b1..6ce546d9 100644
--- a/testsuite/systemtap.maps/log_edge.exp
+++ b/testsuite/systemtap.maps/log_edge.exp
@@ -43,8 +43,7 @@ value |-------------------------------------------------- count
 
 bucket 65: 1
 bucket 66: 2
-bucket 67: 1
-}
+bucket 67: 1}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/si.exp b/testsuite/systemtap.maps/si.exp
index 600687ed..eb1b05c7 100644
--- a/testsuite/systemtap.maps/si.exp
+++ b/testsuite/systemtap.maps/si.exp
@@ -61,8 +61,7 @@ foo[6] = 91
 foo[7] = 140
 foo[8] = 204
 foo[9] = 285
-foo[10] = 385
-}
+foo[10] = 385}
 
 stap_run2 $srcdir/$subdir/$test.stp
 
diff --git a/testsuite/systemtap.maps/ss.exp b/testsuite/systemtap.maps/ss.exp
index 548a888e..9978ead0 100644
--- a/testsuite/systemtap.maps/ss.exp
+++ b/testsuite/systemtap.maps/ss.exp
@@ -61,7 +61,6 @@ foo[6] = # 36
 foo[7] = # 49
 foo[8] = # 64
 foo[9] = # 81
-foo[10] = # 100
-}
+foo[10] = # 100}
 
 stap_run2 $srcdir/$subdir/$test.stp