From: Mark Wielaard Date: Thu, 28 Aug 2014 22:51:38 +0000 (+0000) Subject: gdbserver_tests filter out and don't expect empty lines. X-Git-Tag: svn/VALGRIND_3_10_0~125 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f65b136853445bc3b227524fd95f2b60e45cc37c;p=thirdparty%2Fvalgrind.git 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 11f151a3da..bba945425f 100755 --- 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 9f0b518dcf..2442ec57ee 100755 --- 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 8c9826a45c..b9a2ee2f1c 100644 --- 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 6e6ab2635b..aa5862289b 100644 --- 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 : merge recursive calls in max frames v.set vgdb-error : debug me at error >= - memcheck monitor commands: get_vbits [] returns validity bits for (or 1) bytes at @@ -43,7 +42,6 @@ memcheck monitor commands: shows places pointing inside (default 1) bytes at (with len 1, only shows "start pointers" pointing exactly to , with len > 1, will also show "interior pointers") - general valgrind monitor commands: help [debug] : monitor command help. With debug: + debugging commands v.wait [] : sleep (default 0) then continue @@ -72,7 +70,6 @@ debugging valgrind internals monitor commands: v.translate [] : debug translation of with (default traceflags 0b00100000 : show after instrumentation) An additional flag 0b100000000 allows to show gdbserver instrumentation - memcheck monitor commands: get_vbits [] returns validity bits for (or 1) bytes at @@ -103,5 +100,4 @@ memcheck monitor commands: shows places pointing inside (default 1) bytes at (with len 1, only shows "start pointers" pointing exactly to , 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 76c4fdbcc3..0496c1d6aa 100644 --- 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 4f7066558f..7782119068 100644 --- 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 7f8de97521..4e96ffce6a 100644 --- 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 a429670c43..3708ffbea7 100644 --- 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 1951b6a7ed..80659b8668 100644 --- 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 840ce4c1b6..afb594c023 100644 --- 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 58a9d12732..62c47b045c 100644 --- 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 : merge recursive calls in max frames v.set vgdb-error : debug me at error >= - massif monitor commands: snapshot [] detailed_snapshot [] takes a snapshot (or a detailed snapshot) and saves it in default is massif.vgdb.out - monitor command request to kill this process Remote connection closed