Fix a whole lot more regression tests on Red Hat 7.3.

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

diff --git a/addrcheck/tests/true.stderr.exp b/addrcheck/tests/true.stderr.exp
index c4aa6f04fe5303f75950d57590f65cf38b4a5857..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/addrcheck/tests/true.stderr.exp
+++ b/addrcheck/tests/true.stderr.exp
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/addrcheck/tests/true.vgtest b/addrcheck/tests/true.vgtest
index 24fc0a48c58a9f520480eaf63284dda8ea77e906..5c1535c43c8c72bb5078aac1dc098de880a46ec5 100644 (file)
--- a/addrcheck/tests/true.vgtest
+++ b/addrcheck/tests/true.vgtest
@@ -1 +1,2 @@
 prog: ../../tests/true
+vgopts: -q

diff --git a/memcheck/tests/fprw.stderr.exp b/memcheck/tests/fprw.stderr.exp
index 8773db7735fd8b7990fdd00034b820ee2a16b303..5371a3b4cd8249e2cece338884c243497641c3b5 100644 (file)
--- a/memcheck/tests/fprw.stderr.exp
+++ b/memcheck/tests/fprw.stderr.exp
@@ -1,4 +1,3 @@
-
 Use of uninitialised value of size 8
    at 0x........: main (fprw.c:14)
    by 0x........: __libc_start_main (...libc...)
@@ -75,9 +74,3 @@ Invalid write of size 8
    by 0x........: main (fprw.c:23)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
-
-ERROR SUMMARY: 10 errors from 10 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4 bytes in 1 blocks.
-malloc/free: 3 allocs, 3 frees, 16 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/fprw.vgtest b/memcheck/tests/fprw.vgtest
index d44e04a35cf74b6f61a947e56ce51dc36158de83..a5dfb425f1854608d00a304fd2c2c93b8473e58b 100644 (file)
--- a/memcheck/tests/fprw.vgtest
+++ b/memcheck/tests/fprw.vgtest
@@ -1,2 +1,2 @@
-vgopts: --single-step=yes
+vgopts: --single-step=yes -q
 prog:   fprw

diff --git a/memcheck/tests/nanoleak_supp.stderr.exp b/memcheck/tests/nanoleak_supp.stderr.exp
index 9fb7bfe23c09fcead3659efc1e82507f285a225d..3e620b322c14d58b559e91e45f1ba9a6254685cc 100644 (file)
--- a/memcheck/tests/nanoleak_supp.stderr.exp
+++ b/memcheck/tests/nanoleak_supp.stderr.exp
@@ -1,9 +1,3 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 1000 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 1000 bytes allocated.
-For counts of detected errors, rerun with: -v
 searching for pointers to 1 not-freed blocks.
 checked ... bytes.
 

diff --git a/memcheck/tests/nanoleak_supp.vgtest b/memcheck/tests/nanoleak_supp.vgtest
index 766099c30e4348cc5e09713fdd07db684f69eabc..57e8947012e9e901812dabaf5c704aa3bb198c31 100644 (file)
--- a/memcheck/tests/nanoleak_supp.vgtest
+++ b/memcheck/tests/nanoleak_supp.vgtest
@@ -1,3 +1,3 @@
-vgopts: --leak-check=yes --suppressions=nanoleak.supp
+vgopts: --leak-check=yes --suppressions=nanoleak.supp -q
 prog: nanoleak
 stderr_filter: filter_leak_check_size

diff --git a/memcheck/tests/null_socket.stderr.exp b/memcheck/tests/null_socket.stderr.exp
index c4aa6f04fe5303f75950d57590f65cf38b4a5857..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/memcheck/tests/null_socket.stderr.exp
+++ b/memcheck/tests/null_socket.stderr.exp
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/null_socket.vgtest b/memcheck/tests/null_socket.vgtest
index 7dc33a9ad1cf801e963ec337c7901ee9540c5641..7f3a2a49215540c4b19241be22c5d94d28b10320 100644 (file)
--- a/memcheck/tests/null_socket.vgtest
+++ b/memcheck/tests/null_socket.vgtest
@@ -1 +1,2 @@
 prog: null_socket
+vgopts: -q

diff --git a/memcheck/tests/overlap.stderr.exp b/memcheck/tests/overlap.stderr.exp
index c23cb722154d7717b9c8c6a0e48e2216053bf6f4..02180eb020185bfd1c0b815d991ed991575fbe55 100644 (file)
--- a/memcheck/tests/overlap.stderr.exp
+++ b/memcheck/tests/overlap.stderr.exp
@@ -1,4 +1,3 @@
-
 Source and destination overlap in memcpy(0x........, 0x........, 21)
    at 0x........: memcpy (mc_replace_strmem.c:...)
    by 0x........: main (overlap.c:40)
@@ -40,9 +39,3 @@ Source and destination overlap in strncat(0x........, 0x........, 21)
    by 0x........: main (overlap.c:113)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
-
-ERROR SUMMARY: 8 errors from 7 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/overlap.vgtest b/memcheck/tests/overlap.vgtest
index 7d0d75e10d4cb8f55a21da27d0638bcb27bd14d0..54a0baacfb7b336b2ff39506436dc1b6abdf1c31 100644 (file)
--- a/memcheck/tests/overlap.vgtest
+++ b/memcheck/tests/overlap.vgtest
@@ -1 +1,2 @@
 prog: overlap
+vgopts: -q

diff --git a/memcheck/tests/pushfpopf.stderr.exp b/memcheck/tests/pushfpopf.stderr.exp
index bab4ec6def93f0606fc5fd5c58877b652521561d..bb73b19ec0461b1552497c17005c040883e70e7b 100644 (file)
--- a/memcheck/tests/pushfpopf.stderr.exp
+++ b/memcheck/tests/pushfpopf.stderr.exp
@@ -1,12 +1,5 @@
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: fooble (...)
    by 0x........: main (pushfpopf_c.c:12)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/pushfpopf.vgtest b/memcheck/tests/pushfpopf.vgtest
index 32fa5af674da8e5f89c50f3713d3cf54ee07e870..94cdcef78a6e2db1d82a8439ea95dc6263db8258 100644 (file)
--- a/memcheck/tests/pushfpopf.vgtest
+++ b/memcheck/tests/pushfpopf.vgtest
@@ -1,2 +1,3 @@
 prog: pushfpopf
 stderr_filter: filter_pushfpopf
+vgopts: -q

diff --git a/memcheck/tests/realloc1.c b/memcheck/tests/realloc1.c
index a5d1edc64f5bf47cd5f62af612865668fbeff220..91878b332486909a0194af59fcd62fe81f1b1584 100644 (file)
--- a/memcheck/tests/realloc1.c
+++ b/memcheck/tests/realloc1.c
@@ -1,4 +1,9 @@
 
+/* Anyone know what this is supposed to test?  I don't
+   (JRS 2003-07-07) -- which ain't good considering I
+   probably created it :)
+*/
+
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/memcheck/tests/realloc1.stderr.exp b/memcheck/tests/realloc1.stderr.exp
index 14ec5948a46b6ef8dc758fcca25f136fd471d49e..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/memcheck/tests/realloc1.stderr.exp
+++ b/memcheck/tests/realloc1.stderr.exp
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 49 bytes in 1 blocks.
-malloc/free: 49 allocs, 48 frees, 1225 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/realloc1.vgtest b/memcheck/tests/realloc1.vgtest
index d0d10d7d7510e6d86aa05cc4c6c2a2e2123e409a..bab181f51fc067e01fef808b6f88258d13fa4b54 100644 (file)
--- a/memcheck/tests/realloc1.vgtest
+++ b/memcheck/tests/realloc1.vgtest
@@ -1 +1,2 @@
 prog: realloc1
+vgopts: -q

diff --git a/memcheck/tests/realloc2.stderr.exp b/memcheck/tests/realloc2.stderr.exp
index 8ed84268fd063b77918c6782307ffd012d7a7a1f..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/memcheck/tests/realloc2.stderr.exp
+++ b/memcheck/tests/realloc2.stderr.exp
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 30000 allocs, 30000 frees, 16050000 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/realloc2.vgtest b/memcheck/tests/realloc2.vgtest
index 0a28b23c26b29e229ea03e01ad68c772000e4ce6..8d7803953aebe23717c1539629055776182131eb 100644 (file)
--- a/memcheck/tests/realloc2.vgtest
+++ b/memcheck/tests/realloc2.vgtest
@@ -1 +1,2 @@
 prog: realloc2
+vgopts: -q

diff --git a/memcheck/tests/sigaltstack.stderr.exp b/memcheck/tests/sigaltstack.stderr.exp
index a93437cffda5972ea72a828f7afc9307072cd62c..ae99b446e97f2580ab0532218168a0e0ceffefc1 100644 (file)
--- a/memcheck/tests/sigaltstack.stderr.exp
+++ b/memcheck/tests/sigaltstack.stderr.exp
@@ -1,4 +1,3 @@
-
 calling sigaltstack, stack base is 0x........
 setting sigaction
 Syscall param sigaction(act) contains uninitialised or unaddressable byte(s)
@@ -8,9 +7,3 @@ res = 0
 raising the signal
 caught signal, local var is on 0x........
 done
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 8192 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 8192 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/sigaltstack.vgtest b/memcheck/tests/sigaltstack.vgtest
index 2587d4c4abb8868186cdc510698b3491e342dbf3..532bb26ba02e7a57338a93bb8eb31ab6b3b29897 100644 (file)
--- a/memcheck/tests/sigaltstack.vgtest
+++ b/memcheck/tests/sigaltstack.vgtest
@@ -1,2 +1,3 @@
 prog: sigaltstack
 stderr_filter: ./filter_stderr_backtrace
+vgopts: -q

diff --git a/memcheck/tests/signal2.stderr.exp b/memcheck/tests/signal2.stderr.exp
index d88198a04c26183f260d7fa5638ba1403c429cd4..870970266d71d348f4a3757a34a631152d79ec12 100644 (file)
--- a/memcheck/tests/signal2.stderr.exp
+++ b/memcheck/tests/signal2.stderr.exp
@@ -1,12 +1,5 @@
-
 Invalid write of size 4
    at 0x........: main (signal2.c:17)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
    Address 0x........ is not stack'd, malloc'd or free'd
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/signal2.vgtest b/memcheck/tests/signal2.vgtest
index c301370eb9c61aa2c83cdd3b4ae73d57bd680cf9..f55551cea9f4689f28b774c03f4c4e8201ba1197 100644 (file)
--- a/memcheck/tests/signal2.vgtest
+++ b/memcheck/tests/signal2.vgtest
@@ -1 +1,2 @@
 prog: signal2
+vgopts: -q

diff --git a/memcheck/tests/supp.c b/memcheck/tests/supp.c
index 50c4a813288d00d856693fa2575967604a390c6c..fe1200e3f77b30df14dbfd81d3d0c1bb195b4072 100644 (file)
--- a/memcheck/tests/supp.c
+++ b/memcheck/tests/supp.c
@@ -3,7 +3,7 @@
 int
 main ()
 {
-  int x;
+  volatile int x;  /* make sure it isn't in a register */
 
   if (x == 0)
      return 0;

diff --git a/memcheck/tests/supp1.stderr.exp b/memcheck/tests/supp1.stderr.exp
index 6d763a7c8902581dba25bf0e11e43fd6ef91c570..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/memcheck/tests/supp1.stderr.exp
+++ b/memcheck/tests/supp1.stderr.exp
@@ -1,7 +0,0 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 1 from 1)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/supp1.vgtest b/memcheck/tests/supp1.vgtest
index 31130ffa63c210ff6d7b45b96f5b4c74ebaaba79..02e23ba0c12bd0fdd97aa38eb264c9aa5836b55b 100644 (file)
--- a/memcheck/tests/supp1.vgtest
+++ b/memcheck/tests/supp1.vgtest
@@ -1,2 +1,2 @@
-vgopts: --suppressions=supp.supp
+vgopts: --suppressions=supp.supp -q
 prog: supp1

diff --git a/memcheck/tests/supp2.stderr.exp b/memcheck/tests/supp2.stderr.exp
index 9f1298829da5cfd7c502f38f53b077735dbab895..50a591aec76f2b8d564914354b50696974a44bbe 100644 (file)
--- a/memcheck/tests/supp2.stderr.exp
+++ b/memcheck/tests/supp2.stderr.exp
@@ -1,11 +1,4 @@
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: main (supp.c:8)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/supp2.vgtest b/memcheck/tests/supp2.vgtest
index f5200b02f19cde89625cbb96e0d203154efd8157..c4f3350e91edf2a429635c62150c6b1a32ea3d9b 100644 (file)
--- a/memcheck/tests/supp2.vgtest
+++ b/memcheck/tests/supp2.vgtest
@@ -1,2 +1,2 @@
-vgopts: --suppressions=supp.supp
+vgopts: --suppressions=supp.supp -q
 prog: supp2

diff --git a/memcheck/tests/suppfree.stderr.exp b/memcheck/tests/suppfree.stderr.exp
index 5f4f4d5ee31bae80792640357c5e81a68e6b9fca..cb70723ce93235d47eab7e497306ddd66093bfe8 100644 (file)
--- a/memcheck/tests/suppfree.stderr.exp
+++ b/memcheck/tests/suppfree.stderr.exp
@@ -1,4 +1,3 @@
-
 Invalid free() / delete / delete[]
    at 0x........: free (vg_replace_malloc.c:...)
    by 0x........: ddd (suppfree.c:7)
@@ -9,9 +8,3 @@ Invalid free() / delete / delete[]
    by 0x........: ddd (suppfree.c:6)
    by 0x........: ccc (suppfree.c:12)
    by 0x........: bbb (suppfree.c:17)
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 1 allocs, 2 frees, 10 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/suppfree.vgtest b/memcheck/tests/suppfree.vgtest
index bd38f8a14e0b0f65d38cf3be8076ac0eca3ab826..a7789c3edc7a0aef427c984391644b66daf2a9a7 100644 (file)
--- a/memcheck/tests/suppfree.vgtest
+++ b/memcheck/tests/suppfree.vgtest
@@ -1 +1,2 @@
 prog: suppfree
+vgopts: -q

diff --git a/memcheck/tests/trivialleak.stderr.exp b/memcheck/tests/trivialleak.stderr.exp
index 77e0a60c0b03f547aa286dcf583f970b90b69dfb..e806de187bcd018f6a0223ecdc36e194d9492914 100644 (file)
--- a/memcheck/tests/trivialleak.stderr.exp
+++ b/memcheck/tests/trivialleak.stderr.exp
@@ -1,9 +1,3 @@
-
-
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 1000 bytes in 1000 blocks.
-malloc/free: 1000 allocs, 0 frees, 1000 bytes allocated.
-For counts of detected errors, rerun with: -v
 searching for pointers to 1000 not-freed blocks.
 checked ... bytes.
 

diff --git a/memcheck/tests/trivialleak.vgtest b/memcheck/tests/trivialleak.vgtest
index c5b68a86efc7e7f5e46ecfa376be26ba1b504985..7d66a3c0d36f16b0faab2efb4e93a0958bef966b 100644 (file)
--- a/memcheck/tests/trivialleak.vgtest
+++ b/memcheck/tests/trivialleak.vgtest
@@ -1,3 +1,3 @@
-vgopts: --leak-check=yes
+vgopts: --leak-check=yes -q
 prog: trivialleak
 stderr_filter: filter_leak_check_size

diff --git a/memcheck/tests/tronical.stderr.exp b/memcheck/tests/tronical.stderr.exp
index ca95c16947a1ed2cddfe5f4ea52031fbec90a63c..de3899ae50ce2ea17d3c7d31fcdbd45468b23efc 100644 (file)
--- a/memcheck/tests/tronical.stderr.exp
+++ b/memcheck/tests/tronical.stderr.exp
@@ -1,12 +1,5 @@
-
 Conditional jump or move depends on uninitialised value(s)
    at 0x........: get (...)
    by 0x........: main (...)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
-
-ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 4 bytes in 1 blocks.
-malloc/free: 1 allocs, 0 frees, 4 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/tronical.vgtest b/memcheck/tests/tronical.vgtest
index 078a025cc367b7b021e0e744156c8b2586aefaaa..1fdf863b612ffbeaeeb6ecf616096263d3a9116c 100644 (file)
--- a/memcheck/tests/tronical.vgtest
+++ b/memcheck/tests/tronical.vgtest
@@ -1,2 +1,3 @@
 prog: tronical
 stderr_filter: filter_tronical
+vgopts: -q

diff --git a/memcheck/tests/weirdioctl.stderr.exp b/memcheck/tests/weirdioctl.stderr.exp
index ee06fe5b13976fb132d40f5d09e13e875be65da3..8303590bab3d5c7edfa1807e01000501c971fc12 100644 (file)
--- a/memcheck/tests/weirdioctl.stderr.exp
+++ b/memcheck/tests/weirdioctl.stderr.exp
@@ -1,12 +1,5 @@
-
 Syscall param ioctl(TCSET{A,AW,AF}) contains uninitialised or unaddressable byte(s)
    at 0x........: __ioctl (in /...libc...)
    by 0x........: __libc_start_main (...libc...)
    by 0x........: ...
    Address 0x........ is on thread 1's stack
-
-ERROR SUMMARY: 2 errors from 1 contexts (suppressed: 0 from 0)
-malloc/free: in use at exit: 0 bytes in 0 blocks.
-malloc/free: 0 allocs, 0 frees, 0 bytes allocated.
-For a detailed leak analysis,  rerun with: --leak-check=yes
-For counts of detected errors, rerun with: -v

diff --git a/memcheck/tests/weirdioctl.stdout.exp b/memcheck/tests/weirdioctl.stdout.exp
index bb65b7cb4d313755eec6424d1b3dbbb3022fd883..f9d4a593468f6abbc9aa9f01038b260f1837aa59 100644 (file)
--- a/memcheck/tests/weirdioctl.stdout.exp
+++ b/memcheck/tests/weirdioctl.stdout.exp
@@ -32,6 +32,9 @@ got 84
 got 73
 got 77
 got 69
+got 32
+got 45
+got 113
 got 10
 got 112
 got 114
@@ -46,7 +49,4 @@ got 101
 got 105
 got 114
 got 100
-got 105
-got 111
-got 99
 second ioctl returned -1

diff --git a/memcheck/tests/weirdioctl.vgtest b/memcheck/tests/weirdioctl.vgtest
index e8d86302131e812f5f6dca663cca81bb76ff2d65..8f5d430bde42dfc4dc8194711e656fa67ac9641a 100644 (file)
--- a/memcheck/tests/weirdioctl.vgtest
+++ b/memcheck/tests/weirdioctl.vgtest
@@ -1,3 +1,3 @@
-vgopts: --weird-hacks=ioctl-VTIME
+vgopts: --weird-hacks=ioctl-VTIME -q
 prog:   weirdioctl
 args:   < weirdioctl.vgtest