From f6585b0bdc22577b125342542087722dd97629a7 Mon Sep 17 00:00:00 2001 From: Martijn van Beurden Date: Sun, 21 Apr 2013 23:12:16 +0200 Subject: Reduce valgrind num-callers to 50 My Valgrind doesn't run, saying it doesn't support showing more than 50 entries of a stack trace Signed-off-by: Erik de Castro Lopo --- test/test_bins.sh | 4 ++-- test/test_flac.sh | 8 ++++---- test/test_grabbag.sh | 8 ++++---- test/test_libFLAC++.sh | 2 +- test/test_libFLAC.sh | 2 +- test/test_metaflac.sh | 12 ++++++------ test/test_seeking.sh | 12 ++++++------ test/test_streams.sh | 4 ++-- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/test_bins.sh b/test/test_bins.sh index 65ba6e20..92d66937 100755 --- a/test/test_bins.sh +++ b/test/test_bins.sh @@ -52,8 +52,8 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 flac $*" >>test_bins.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_bins.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_bins.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_bins.valgrind.log else flac $* fi diff --git a/test/test_flac.sh b/test/test_flac.sh index 10981c0b..9374a650 100755 --- a/test/test_flac.sh +++ b/test/test_flac.sh @@ -63,8 +63,8 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 flac $*" >>test_flac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_flac.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_flac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_flac.valgrind.log else flac $* fi @@ -73,8 +73,8 @@ run_flac () run_metaflac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 metaflac $*" >>test_flac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 metaflac $* 4>>test_flac.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_flac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_flac.valgrind.log else metaflac $* fi diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh index 5d9f9d1c..4c291c44 100755 --- a/test/test_grabbag.sh +++ b/test/test_grabbag.sh @@ -46,8 +46,8 @@ test_picture -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_picture ex run_test_cuesheet () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 test_cuesheet $*" >>test_grabbag.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_cuesheet $*" >>test_grabbag.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log else test_cuesheet $* fi @@ -56,8 +56,8 @@ run_test_cuesheet () run_test_picture () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 test_picture $*" >>test_grabbag.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 test_picture $* 4>>test_grabbag.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_picture $*" >>test_grabbag.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_picture $* 4>>test_grabbag.valgrind.log else test_picture $* fi diff --git a/test/test_libFLAC++.sh b/test/test_libFLAC++.sh index 419512ea..369cb3a6 100755 --- a/test/test_libFLAC++.sh +++ b/test/test_libFLAC++.sh @@ -43,7 +43,7 @@ PATH=../objs/$BUILD/bin:$PATH run_test_libFLACpp () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 test_libFLAC++ $* 4>>test_libFLAC++.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_libFLAC++ $* 4>>test_libFLAC++.valgrind.log else test_libFLAC++ $* fi diff --git a/test/test_libFLAC.sh b/test/test_libFLAC.sh index 50f77434..1fda3d4c 100755 --- a/test/test_libFLAC.sh +++ b/test/test_libFLAC.sh @@ -43,7 +43,7 @@ PATH=../objs/$BUILD/bin:$PATH run_test_libFLAC () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 test_libFLAC $* 4>>test_libFLAC.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_libFLAC $* 4>>test_libFLAC.valgrind.log else test_libFLAC $* fi diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh index 4cf5823e..771da04f 100755 --- a/test/test_metaflac.sh +++ b/test/test_metaflac.sh @@ -66,8 +66,8 @@ metaflac --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac execut run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 flac $*" >>test_metaflac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_metaflac.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_metaflac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_metaflac.valgrind.log else flac $* fi @@ -76,8 +76,8 @@ run_flac () run_metaflac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 metaflac $*" >>test_metaflac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 metaflac $* 4>>test_metaflac.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_metaflac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_metaflac.valgrind.log else metaflac $* fi @@ -89,8 +89,8 @@ run_metaflac_silent () run_metaflac $* else if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 metaflac $*" >>test_metaflac.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 metaflac $* 2>/dev/null 4>>test_metaflac.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_metaflac.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 2>/dev/null 4>>test_metaflac.valgrind.log else metaflac $* 2>/dev/null fi diff --git a/test/test_seeking.sh b/test/test_seeking.sh index 653c1526..019a86e9 100755 --- a/test/test_seeking.sh +++ b/test/test_seeking.sh @@ -50,8 +50,8 @@ metaflac --help 1>/dev/null 2>/dev/null || die "ERROR can't find metaflac execut run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 flac $*" >>test_seeking.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_seeking.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_seeking.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_seeking.valgrind.log else flac $* fi @@ -60,8 +60,8 @@ run_flac () run_metaflac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 metaflac $*" >>test_seeking.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 metaflac $* 4>>test_seeking.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 metaflac $*" >>test_seeking.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 metaflac $* 4>>test_seeking.valgrind.log else metaflac $* fi @@ -70,8 +70,8 @@ run_metaflac () run_test_seeking () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 test_seeking $*" >>test_seeking.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 test_seeking $* 4>>test_seeking.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 test_seeking $*" >>test_seeking.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 test_seeking $* 4>>test_seeking.valgrind.log else test_seeking $* fi diff --git a/test/test_streams.sh b/test/test_streams.sh index 8fb609f1..8103be30 100755 --- a/test/test_streams.sh +++ b/test/test_streams.sh @@ -46,8 +46,8 @@ flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" run_flac () { if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then - echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=100 flac $*" >>test_streams.valgrind.log - valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_streams.valgrind.log + echo "valgrind --leak-check=yes --show-reachable=yes --num-callers=50 flac $*" >>test_streams.valgrind.log + valgrind --leak-check=yes --show-reachable=yes --num-callers=50 --log-fd=4 flac $* 4>>test_streams.valgrind.log else flac $* fi -- cgit v1.2.1