From c7957b2b54350b60fdeb6c5201bf45e42655cf4b Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Mon, 27 May 2013 19:22:21 +1000 Subject: [PATCH] test/*.sh : Fix MALLOC_PERTURB initialization. Was using '$(date +%N)', but that doesn't work on OSX or *BSD. Switched to using '$(date +%s)'. --- test/test_bins.sh | 2 +- test/test_flac.sh | 2 +- test/test_grabbag.sh | 2 +- test/test_metaflac.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/test_bins.sh b/test/test_bins.sh index a345b6e..a277a55 100755 --- a/test/test_bins.sh +++ b/test/test_bins.sh @@ -39,7 +39,7 @@ LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH export MALLOC_CHECK_=3 -export MALLOC_PERTURB_==$((1$(date +%N) % 255 + 1)) +export MALLOC_PERTURB_==$(($(date +%s) % 255 + 1)) PATH=../src/flac:$PATH PATH=../objs/$BUILD/bin:$PATH BINS_PATH=../../test_files/bins diff --git a/test/test_flac.sh b/test/test_flac.sh index 662262c..f24893f 100755 --- a/test/test_flac.sh +++ b/test/test_flac.sh @@ -53,7 +53,7 @@ LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((1$(date +%N) % 255 + 1)) +export MALLOC_PERTURB_=$(($(date +%s) % 255 + 1)) PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/metaflac:$PATH PATH=`pwd`/../src/test_streams:$PATH diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh index 2d2faed..12b3e9c 100755 --- a/test/test_grabbag.sh +++ b/test/test_grabbag.sh @@ -36,7 +36,7 @@ LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=../objs/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((1$(date +%N) % 255 + 1)) +export MALLOC_PERTURB_=$(($(date +%s) % 255 + 1)) PATH=../src/test_grabbag/cuesheet:$PATH PATH=../src/test_grabbag/picture:$PATH PATH=../objs/$BUILD/bin:$PATH diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh index 86970a6..c6f7ed1 100755 --- a/test/test_metaflac.sh +++ b/test/test_metaflac.sh @@ -48,7 +48,7 @@ LD_LIBRARY_PATH=`pwd`/../src/share/utf8/.libs:$LD_LIBRARY_PATH LD_LIBRARY_PATH=`pwd`/../objs/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH export MALLOC_CHECK_=3 -export MALLOC_PERTURB_=$((1$(date +%N) % 255 + 1)) +export MALLOC_PERTURB_=$(($(date +%s) % 255 + 1)) PATH=`pwd`/../src/flac:$PATH PATH=`pwd`/../src/metaflac:$PATH PATH=`pwd`/../objs/$BUILD/bin:$PATH -- 2.7.4