From: Paul Floyd Date: Wed, 27 Mar 2024 12:38:21 +0000 (+0100) Subject: regtest: filter line numbers from memcheck tests that count suppressions X-Git-Tag: VALGRIND_3_23_0~95 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=57399bbf5f1d069130a93c5433c022a0a08b0132;p=thirdparty%2Fvalgrind.git regtest: filter line numbers from memcheck tests that count suppressions Now only one suppression file needed per test - no need for 32bit versions. Need to use the same tag for each suppression variant though. --- diff --git a/memcheck/tests/Makefile.am b/memcheck/tests/Makefile.am index 20abbcfe1..e08c124f7 100644 --- a/memcheck/tests/Makefile.am +++ b/memcheck/tests/Makefile.am @@ -167,22 +167,18 @@ EXTRA_DIST = \ sized_aligned_new_delete_misaligned1_supp.vgtest \ sized_aligned_new_delete_misaligned1_supp.supp \ sized_aligned_new_delete_misaligned1_supp.stderr.exp \ - sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 \ sized_aligned_new_delete_misaligned2_supp.vgtest \ sized_aligned_new_delete_misaligned2_supp.supp \ sized_aligned_new_delete_misaligned2_supp.stderr.exp \ - sized_aligned_new_delete_misaligned2_supp.stderr.exp_32 \ sized_aligned_new_delete_misaligned3_supp.vgtest \ sized_aligned_new_delete_misaligned3_supp.supp \ sized_aligned_new_delete_misaligned3_supp.stderr.exp \ - sized_aligned_new_delete_misaligned3_supp.stderr.exp_32 \ new_aligned_delete_default.stderr.exp \ new_aligned_delete_default.stderr.exp_32 \ new_aligned_delete_default.vgtest \ new_delete_mismatch_size.stderr.exp \ new_delete_mismatch_size.vgtest \ new_delete_mismatch_size_supp.stderr.exp \ - new_delete_mismatch_size_supp.stderr.exp_32 \ new_delete_mismatch_size_supp.vgtest \ new_delete_mismatch_size_supp.supp \ deep-backtrace.vgtest deep-backtrace.stderr.exp \ diff --git a/memcheck/tests/filter_used_supp b/memcheck/tests/filter_used_supp index 5403ce723..98c7e9b30 100755 --- a/memcheck/tests/filter_used_supp +++ b/memcheck/tests/filter_used_supp @@ -1,7 +1,14 @@ #! /bin/sh +# the usual stuff ./filter_stderr "$@" | +# no suppressions from default grep -v default\.supp | -grep used_suppression +# just the list of used suppressions +grep used_suppression | + +# ignore the line numbers, allows having more than one stanza for the +# same kind of suppression (to accommodate Darwin using zones) +sed 's/:[0-9]*$//' diff --git a/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp b/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp index 10d5f49fb..afa49bc6d 100644 --- a/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp +++ b/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp @@ -1,4 +1,4 @@ -used_suppression: 1 array aligned new sized aligned delete with size mismatch new_delete_mismatch_size_supp.supp:45 -used_suppression: 1 scalar aligned new sized aligned delete with size mismatch new_delete_mismatch_size_supp.supp:31 -used_suppression: 1 array new sized delete with size mismatch new_delete_mismatch_size_supp.supp:17 -used_suppression: 1 scalar new sized delete with size mismatch new_delete_mismatch_size_supp.supp:3 +used_suppression: 1 array aligned new sized aligned delete with size mismatch new_delete_mismatch_size_supp.supp +used_suppression: 1 scalar aligned new sized aligned delete with size mismatch new_delete_mismatch_size_supp.supp +used_suppression: 1 array new sized delete with size mismatch new_delete_mismatch_size_supp.supp +used_suppression: 1 scalar new sized delete with size mismatch new_delete_mismatch_size_supp.supp diff --git a/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp_32 b/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp_32 deleted file mode 100644 index 6b0ff13d1..000000000 --- a/memcheck/tests/new_delete_mismatch_size_supp.stderr.exp_32 +++ /dev/null @@ -1,4 +0,0 @@ -used_suppression: 1 array aligned new sized aligned delete with size mismatch, 32 bit new_delete_mismatch_size_supp.supp:52 -used_suppression: 1 scalar aligned new sized aligned delete with size mismatch, 32 bit new_delete_mismatch_size_supp.supp:38 -used_suppression: 1 array new sized delete with size mismatch, 32 bit new_delete_mismatch_size_supp.supp:24 -used_suppression: 1 scalar new sized delete with size mismatch, 32 bit new_delete_mismatch_size_supp.supp:10 diff --git a/memcheck/tests/posix_memalign_supp.stderr.exp b/memcheck/tests/posix_memalign_supp.stderr.exp index 080711950..810eacb44 100644 --- a/memcheck/tests/posix_memalign_supp.stderr.exp +++ b/memcheck/tests/posix_memalign_supp.stderr.exp @@ -1,2 +1,2 @@ -used_suppression: 9 posix_memalign align ./posix_memalign_supp.supp:10 -used_suppression: 1 posix_memalign size ./posix_memalign_supp.supp:3 +used_suppression: 9 posix_memalign align ./posix_memalign_supp.supp +used_suppression: 1 posix_memalign size ./posix_memalign_supp.supp diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp index a9c23a829..eae870ef6 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp @@ -1,12 +1,12 @@ -used_suppression: 1 array delete sized aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:114 -used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:86 -used_suppression: 1 scalar delete sized aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:100 -used_suppression: 1 scalar delete sized aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:72 -used_suppression: 1 array delete aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:65 -used_suppression: 1 array new aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:51 -used_suppression: 2 scalar delete aligned nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:44 -used_suppression: 2 scalar new aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:2 -used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:37 -used_suppression: 1 array delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:30 -used_suppression: 1 scalar delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:23 -used_suppression: 1 scalar delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:16 +used_suppression: 1 array delete sized aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 scalar delete sized aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 scalar delete sized aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 array delete aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 array new aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 2 scalar delete aligned nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 2 scalar new aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 array delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 scalar delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp +used_suppression: 1 scalar delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 deleted file mode 100644 index 2b7dec61d..000000000 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.stderr.exp_32 +++ /dev/null @@ -1,12 +0,0 @@ -used_suppression: 1 array delete sized aligned bad alignment, 32bit sized_aligned_new_delete_misaligned1_supp.supp:121 -used_suppression: 1 array delete aligned alignment mismatch, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:93 -used_suppression: 1 scalar delete sized aligned bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:107 -used_suppression: 1 scalar delete sized aligned alignment mismatch, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:79 -used_suppression: 1 array delete aligned nothrow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:65 -used_suppression: 1 array new aligned nothrow bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:58 -used_suppression: 2 scalar delete aligned nothow bad alignment sized_aligned_new_delete_misaligned1_supp.supp:44 -used_suppression: 2 scalar new aligned nothrow bad alignment, 32 bit sized_aligned_new_delete_misaligned1_supp.supp:9 -used_suppression: 1 array delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:37 -used_suppression: 1 array delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:30 -used_suppression: 1 scalar delete aligned alignment mismatch sized_aligned_new_delete_misaligned1_supp.supp:23 -used_suppression: 1 scalar delete aligned bad alignment sized_aligned_new_delete_misaligned1_supp.supp:16 diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp index 8a51a1907..afcb76289 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned1_supp.supp @@ -6,7 +6,7 @@ } { - scalar new aligned nothrow bad alignment, 32 bit + scalar new aligned nothrow bad alignment Memcheck:BadAlign fun:_ZnwjSt11align_val_tRKSt9nothrow_t fun:main @@ -55,7 +55,7 @@ } { - array new aligned nothrow bad alignment, 32 bit + array new aligned nothrow bad alignment Memcheck:BadAlign fun:_ZnajSt11align_val_tRKSt9nothrow_t fun:main @@ -76,7 +76,7 @@ } { - scalar delete sized aligned alignment mismatch, 32 bit + scalar delete sized aligned alignment mismatch Memcheck:AlignMismatch fun:_ZdlPvjSt11align_val_t fun:main @@ -90,7 +90,7 @@ } { - array delete aligned alignment mismatch, 32 bit + array delete aligned alignment mismatch Memcheck:AlignMismatch fun:_ZdaPvjSt11align_val_t fun:main @@ -104,7 +104,7 @@ } { - scalar delete sized aligned bad alignment, 32 bit + scalar delete sized aligned bad alignment Memcheck:BadAlign fun:_ZdlPvjSt11align_val_t fun:main @@ -118,7 +118,7 @@ } { - array delete sized aligned bad alignment, 32bit + array delete sized aligned bad alignment Memcheck:BadAlign fun:_ZdaPvjSt11align_val_t fun:main diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp b/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp index c2a9e40d6..1e979cd09 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp @@ -1 +1 @@ -used_suppression: 1 scalar new aligned bad alignment sized_aligned_new_delete_misaligned2_supp.supp:107 +used_suppression: 1 scalar new aligned bad alignment sized_aligned_new_delete_misaligned2_supp.supp diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp_32 b/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp_32 deleted file mode 100644 index 0325f29fa..000000000 --- a/memcheck/tests/sized_aligned_new_delete_misaligned2_supp.stderr.exp_32 +++ /dev/null @@ -1 +0,0 @@ -used_suppression: 1 scalar new aligned bad alignment, 32 bit sized_aligned_new_delete_misaligned2_supp.supp:114 diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp b/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp index 1abfc2bfc..fe6f64810 100644 --- a/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp +++ b/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp @@ -1 +1 @@ -used_suppression: 1 array new aligned bad alignment sized_aligned_new_delete_misaligned3_supp.supp:121 +used_suppression: 1 array new aligned bad alignment sized_aligned_new_delete_misaligned3_supp.supp diff --git a/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp_32 b/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp_32 deleted file mode 100644 index 397140fc4..000000000 --- a/memcheck/tests/sized_aligned_new_delete_misaligned3_supp.stderr.exp_32 +++ /dev/null @@ -1 +0,0 @@ -used_suppression: 1 array new aligned bad alignment, 32bit sized_aligned_new_delete_misaligned3_supp.supp:128