gdbserver_tests filter out and don't expect empty lines.

Some filters might have left some empty lines in the output.  Filter them
out explicitly and don't expect any empty lines in any of the .exp files.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@14381

diff --git a/gdbserver_tests/filter_helgrind_monitor b/gdbserver_tests/filter_helgrind_monitor
index 11f151a3dadc6e1b1b61309ff771059fb59b8420..bba945425f3414bf21d2697ac403db5e655de02a 100755 (executable)
--- a/gdbserver_tests/filter_helgrind_monitor
+++ b/gdbserver_tests/filter_helgrind_monitor
@@ -7,4 +7,7 @@ dir=`dirname $0`
 $dir/../helgrind/tests/filter_stderr "$@"              |
 
 # filter vgdb messages
-$dir/filter_vgdb 
+$dir/filter_vgdb |
+
+# and remove any remaining empty lines
+sed -e '/^$/d'

diff --git a/gdbserver_tests/filter_vgdb b/gdbserver_tests/filter_vgdb
index 9f0b518dcf76e3439a5f075b1405c3135515c130..2442ec57eea2cb6ee219808a25f75e3ae7ab5ff9 100755 (executable)
--- a/gdbserver_tests/filter_vgdb
+++ b/gdbserver_tests/filter_vgdb
@@ -17,4 +17,7 @@ sed -e 's/\(relaying data between gdb and process \)[0-9][0-9]*/\1..../' \
     -e '/^[1-9][0-9]*  \.\.\/sysdeps\/powerpc\/powerpc32\/dl-start\.S: No such file or directory\./d' |
     
 # filter some debuginfo problems with ld.so and SLES11
-sed -e '/^1    rtld.c: No such file or directory\./d'
+sed -e '/^1    rtld.c: No such file or directory\./d' |
+
+# and filter out any remaining empty lines
+sed -e '/^$/d'

diff --git a/gdbserver_tests/mcclean_after_fork.stderr.exp b/gdbserver_tests/mcclean_after_fork.stderr.exp
index 8c9826a45cf73b64064f99351cb7345dcea35b85..b9a2ee2f1c2aad505275ddd26833f7f3a2cff577 100644 (file)
--- a/gdbserver_tests/mcclean_after_fork.stderr.exp
+++ b/gdbserver_tests/mcclean_after_fork.stderr.exp
@@ -1,16 +1,8 @@
-
 (action at startup) vgdb me ... 
-
-
-
-
-
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
   total heap usage: 0 allocs, 0 frees, 0 bytes allocated
-
 For a detailed leak analysis, rerun with: --leak-check=full
-
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
 Reset valgrind output to log (orderly_finish)

diff --git a/gdbserver_tests/mchelp.stdoutB.exp b/gdbserver_tests/mchelp.stdoutB.exp
index 6e6ab2635b03ba9215203f38f95ce4882c6e554a..aa5862289b332c9fab536b28ec58f12dd82296e5 100644 (file)
--- a/gdbserver_tests/mchelp.stdoutB.exp
+++ b/gdbserver_tests/mchelp.stdoutB.exp
@@ -12,7 +12,6 @@ general valgrind monitor commands:
   v.set mixed_output      : set valgrind output to log, interactive output to gdb
   v.set merge-recursive-frames <num> : merge recursive calls in max <num> frames
   v.set vgdb-error <errornr> : debug me at error >= <errornr> 
-
 memcheck monitor commands:
   get_vbits <addr> [<len>]
         returns validity bits for <len> (or 1) bytes at <addr>
@@ -43,7 +42,6 @@ memcheck monitor commands:
         shows places pointing inside <len> (default 1) bytes at <addr>
         (with len 1, only shows "start pointers" pointing exactly to <addr>,
          with len > 1, will also show "interior pointers")
-
 general valgrind monitor commands:
   help [debug]            : monitor command help. With debug: + debugging commands
   v.wait [<ms>]           : sleep <ms> (default 0) then continue
@@ -72,7 +70,6 @@ debugging valgrind internals monitor commands:
   v.translate <addr> [<traceflags>]  : debug translation of <addr> with <traceflags>
     (default traceflags 0b00100000 : show after instrumentation)
    An additional flag  0b100000000 allows to show gdbserver instrumentation
-
 memcheck monitor commands:
   get_vbits <addr> [<len>]
         returns validity bits for <len> (or 1) bytes at <addr>
@@ -103,5 +100,4 @@ memcheck monitor commands:
         shows places pointing inside <len> (default 1) bytes at <addr>
         (with len 1, only shows "start pointers" pointing exactly to <addr>,
          with len > 1, will also show "interior pointers")
-
 monitor command request to kill this process

diff --git a/gdbserver_tests/mcleak.stderr.exp b/gdbserver_tests/mcleak.stderr.exp
index 76c4fdbcc378fc65f0ceed6d1f02f48310d97c55..0496c1d6aad92f15221166fd1c2baeeda9d19c1b 100644 (file)
--- a/gdbserver_tests/mcleak.stderr.exp
+++ b/gdbserver_tests/mcleak.stderr.exp
@@ -1,12 +1,9 @@
 (action at startup) vgdb me ... 
-
-
 expecting details 10 bytes reachable
 10 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 expecting to have NO details
 expecting details +10 bytes lost, +21 bytes reachable
 expecting details +65 bytes reachable
@@ -24,19 +21,15 @@ suppressed:   0 bytes in  0 blocks
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 21 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:23)
    by 0x........: main (leak-delta.c:60)
-
 32 bytes in 1 blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 33 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-

diff --git a/gdbserver_tests/mcleak.stderrB.exp b/gdbserver_tests/mcleak.stderrB.exp
index 4f7066558fa0cbb399ff02a89d3ed3a79b9bb0df..7782119068577e8066f155b12bea206ee5d6e000 100644 (file)
--- a/gdbserver_tests/mcleak.stderrB.exp
+++ b/gdbserver_tests/mcleak.stderrB.exp
@@ -4,94 +4,75 @@ vgdb-error value changed from 0 to 999999
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 10 (+10) bytes in 1 (+1) blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 21 (+21) bytes in 1 (+1) blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:23)
    by 0x........: main (leak-delta.c:60)
-
 65 (+65) bytes in 2 (+2) blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 10 (+10) bytes in 1 (+1) blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 0 (-10) bytes in 0 (-1) blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 10 (+10) bytes in 1 (+1) blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 0 (-10) bytes in 0 (-1) blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 10 (+10) bytes in 1 (+1) blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 32 (+32) bytes in 1 (+1) blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 33 (-32) bytes in 1 (-1) blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 10 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:14)
    by 0x........: main (leak-delta.c:60)
-
 21 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:23)
    by 0x........: main (leak-delta.c:60)
-
 32 bytes in 1 blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 33 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 32 bytes in 1 blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 33 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 33 bytes in 1 blocks are still reachable in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-
 32 bytes in 1 blocks are definitely lost in loss record ... of ...
    at 0x........: malloc (vg_replace_malloc.c:...)
    by 0x........: f (leak-delta.c:28)
    by 0x........: main (leak-delta.c:60)
-

diff --git a/gdbserver_tests/mcmain_pic.stderr.exp b/gdbserver_tests/mcmain_pic.stderr.exp
index 7f8de97521bb596fe8a5b9f0917881669359b80e..4e96ffce6ad53cf182a813d3d9cf194529fc8bd1 100644 (file)
--- a/gdbserver_tests/mcmain_pic.stderr.exp
+++ b/gdbserver_tests/mcmain_pic.stderr.exp
@@ -1,13 +1,7 @@
-
 (action at startup) vgdb me ... 
-
-
-
 HEAP SUMMARY:
     in use at exit: 16 bytes in 1 blocks
   total heap usage: 1 allocs, 0 frees, 16 bytes allocated
-
 For a detailed leak analysis, rerun with: --leak-check=full
-
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/gdbserver_tests/mcsignopass.stderr.exp b/gdbserver_tests/mcsignopass.stderr.exp
index a429670c43730fc1a409ab035380e9406e608b6d..3708ffbea733d4544b65454472d19c14ea92cdf1 100644 (file)
--- a/gdbserver_tests/mcsignopass.stderr.exp
+++ b/gdbserver_tests/mcsignopass.stderr.exp
@@ -1,22 +1,15 @@
-
 (action at startup) vgdb me ... 
-
-
 Test 1: Invalid write of size 4
    at 0x........: test1 (faultstatus.c:105)
    by 0x........: main (faultstatus.c:168)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
-
   PASS
 Test 2:   PASS
 Test 3:   PASS
 Test 4:   PASS
-
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
   total heap usage: 0 allocs, 0 frees, 0 bytes allocated
-
 For a detailed leak analysis, rerun with: --leak-check=full
-
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 11 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/gdbserver_tests/mcsigpass.stderr.exp b/gdbserver_tests/mcsigpass.stderr.exp
index 1951b6a7edc9697e1a1b82d7cb46df393b14bc16..80659b8668ceb3bc6c2bb7284f5847a2a7a9906d 100644 (file)
--- a/gdbserver_tests/mcsigpass.stderr.exp
+++ b/gdbserver_tests/mcsigpass.stderr.exp
@@ -1,22 +1,15 @@
-
 (action at startup) vgdb me ... 
-
-
 Test 1: Invalid write of size 4
    at 0x........: test1 (faultstatus.c:105)
    by 0x........: main (faultstatus.c:168)
  Address 0x........ is not stack'd, malloc'd or (recently) free'd
-
   PASS
 Test 2:   PASS
 Test 3:   PASS
 Test 4:   PASS
-
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
   total heap usage: 0 allocs, 0 frees, 0 bytes allocated
-
 For a detailed leak analysis, rerun with: --leak-check=full
-
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)

diff --git a/gdbserver_tests/mcwatchpoints.stderr.exp b/gdbserver_tests/mcwatchpoints.stderr.exp
index 840ce4c1b6ebb2b022316496dee5bd6deac8c0a7..afb594c0231e0e962eefaee6a2f89df4270d6b3c 100644 (file)
--- a/gdbserver_tests/mcwatchpoints.stderr.exp
+++ b/gdbserver_tests/mcwatchpoints.stderr.exp
@@ -1,7 +1,4 @@
-
 (action at startup) vgdb me ... 
-
-
 breakme function called from line 19
 before reading 0/4/8
 u: Expected value at 0
@@ -17,12 +14,9 @@ before rewriting 4
 before rewriting 8
 value 0nde4ine8
 value of k50[1000] p
-
 HEAP SUMMARY:
     in use at exit: 0 bytes in 0 blocks
   total heap usage: 1 allocs, 1 frees, 50,000 bytes allocated
-
 For a detailed leak analysis, rerun with: --leak-check=full
-
 For counts of detected and suppressed errors, rerun with: -v
 ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

diff --git a/gdbserver_tests/mssnapshot.stderrB.exp b/gdbserver_tests/mssnapshot.stderrB.exp
index 58a9d12732fc8d95f9d9f16e57db36df4ebb2b7e..62c47b045c2e107643394b461ecb32ab1125d912 100644 (file)
--- a/gdbserver_tests/mssnapshot.stderrB.exp
+++ b/gdbserver_tests/mssnapshot.stderrB.exp
@@ -14,13 +14,11 @@ general valgrind monitor commands:
   v.set mixed_output      : set valgrind output to log, interactive output to gdb
   v.set merge-recursive-frames <num> : merge recursive calls in max <num> frames
   v.set vgdb-error <errornr> : debug me at error >= <errornr> 
-
 massif monitor commands:
   snapshot [<filename>]
   detailed_snapshot [<filename>]
        takes a snapshot (or a detailed snapshot)
        and saves it in <filename>
              default <filename> is massif.vgdb.out
-
 monitor command request to kill this process
 Remote connection closed