switch from --logfile-fd= to --log-fd= to match newer valgrind options

diff --git a/test/test_bins.sh b/test/test_bins.sh
index a8c6517..dc12890 100755 (executable)
--- a/test/test_bins.sh
+++ b/test/test_bins.sh
@@ -51,7 +51,7 @@ 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 --logfile-fd=4 flac $* 4>>test_bins.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --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 8eff783..af916ea 100755 (executable)
--- a/test/test_flac.sh
+++ b/test/test_flac.sh
@@ -59,7 +59,7 @@ 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 --logfile-fd=4 flac $* 4>>test_flac.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_flac.valgrind.log
        else
                flac $*
        fi
@@ -69,7 +69,7 @@ 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 --logfile-fd=4 metaflac $* 4>>test_flac.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --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 68a1e2d..a18a931 100755 (executable)
--- a/test/test_grabbag.sh
+++ b/test/test_grabbag.sh
@@ -45,7 +45,7 @@ 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 --logfile-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 test_cuesheet $* 4>>test_grabbag.valgrind.log
        else
                test_cuesheet $*
        fi
@@ -55,7 +55,7 @@ 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 --logfile-fd=4 test_picture $* 4>>test_grabbag.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --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 dfe5cfb..550c6bd 100755 (executable)
--- a/test/test_libFLAC++.sh
+++ b/test/test_libFLAC++.sh
@@ -41,7 +41,7 @@ PATH=../obj/$BUILD/bin:$PATH
 run_test_libFLACpp ()
 {
        if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
-               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_libFLAC++ $* 4>>test_libFLAC++.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --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 0a4e7c0..5343ef0 100755 (executable)
--- a/test/test_libFLAC.sh
+++ b/test/test_libFLAC.sh
@@ -40,7 +40,7 @@ PATH=../obj/$BUILD/bin:$PATH
 run_test_libFLAC ()
 {
        if [ x"$FLAC__TEST_WITH_VALGRIND" = xyes ] ; then
-               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --logfile-fd=4 test_libFLAC $* 4>>test_libFLAC.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --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 638a3bd..f39a321 100755 (executable)
--- a/test/test_metaflac.sh
+++ b/test/test_metaflac.sh
@@ -60,7 +60,7 @@ 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 --logfile-fd=4 flac $* 4>>test_metaflac.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_metaflac.valgrind.log
        else
                flac $*
        fi
@@ -70,7 +70,7 @@ 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 --logfile-fd=4 metaflac $* 4>>test_metaflac.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 metaflac $* 4>>test_metaflac.valgrind.log
        else
                metaflac $*
        fi
@@ -83,7 +83,7 @@ run_metaflac_silent ()
        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 --logfile-fd=4 metaflac $* 2>/dev/null 4>>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
                else
                        metaflac $* 2>/dev/null
                fi

diff --git a/test/test_seeking.sh b/test/test_seeking.sh
index 0a5c833..8f52875 100755 (executable)
--- a/test/test_seeking.sh
+++ b/test/test_seeking.sh
@@ -49,7 +49,7 @@ 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 --logfile-fd=4 flac $* 4>>test_seeking.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_seeking.valgrind.log
        else
                flac $*
        fi
@@ -59,7 +59,7 @@ 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 --logfile-fd=4 metaflac $* 4>>test_seeking.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 metaflac $* 4>>test_seeking.valgrind.log
        else
                metaflac $*
        fi
@@ -69,7 +69,7 @@ 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 --logfile-fd=4 test_seeking $* 4>>test_seeking.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --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 36e1bd4..3b1dc05 100755 (executable)
--- a/test/test_streams.sh
+++ b/test/test_streams.sh
@@ -45,7 +45,7 @@ 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 --logfile-fd=4 flac $* 4>>test_streams.valgrind.log
+               valgrind --leak-check=yes --show-reachable=yes --num-callers=100 --log-fd=4 flac $* 4>>test_streams.valgrind.log
        else
                flac $*
        fi