From b43d3cbd9ee4ca6217ec886174befb3fd0acf2db Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Tue, 9 Nov 2004 01:28:05 +0000 Subject: [PATCH] fix PATH and LD_LIBRARY_PATH settings, pass build type as first arg to test scripts --- test/Makefile.am | 2 ++ test/Makefile.lite | 23 ++++++++++++++--------- test/test_bins.sh | 18 ++++++++++++++++-- test/test_flac.sh | 22 +++++++++++++++++++--- test/test_grabbag.sh | 14 ++++++++++++-- test/test_libFLAC++.sh | 16 +++++++++++++--- test/test_libFLAC.sh | 15 ++++++++++++--- test/test_libOggFLAC++.sh | 17 ++++++++++++++--- test/test_libOggFLAC.sh | 16 +++++++++++++--- test/test_metaflac.sh | 19 +++++++++++++++++-- test/test_streams.sh | 12 ++++++++++-- 11 files changed, 142 insertions(+), 32 deletions(-) diff --git a/test/Makefile.am b/test/Makefile.am index 6988d17..e8242e1 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -44,6 +44,7 @@ TESTS = \ ./test_flac.sh \ ./test_metaflac.sh \ ./test_grabbag.sh \ + ./test_seeking.sh \ ./test_streams.sh \ ./test_bins.sh @@ -59,6 +60,7 @@ EXTRA_DIST = \ test_flac.sh \ test_metaflac.sh \ test_grabbag.sh \ + test_seeking.sh \ test_streams.sh \ test_bins.sh diff --git a/test/Makefile.lite b/test/Makefile.lite index 414d845..95d16c4 100644 --- a/test/Makefile.lite +++ b/test/Makefile.lite @@ -22,15 +22,16 @@ topdir = .. all: clean - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC++.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC++.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_flac.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_metaflac.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_grabbag.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_streams.sh - $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_bins.sh + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libFLAC++.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_libOggFLAC++.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_flac.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_metaflac.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_grabbag.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_seeking.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_streams.sh $(BUILD) + $(FLAC__EXHAUSTIVE_TESTS) $(FLAC__VALGRIND) ./test_bins.sh $(BUILD) debug : FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=yes valgrind: FLAC__EXHAUSTIVE_TESTS=FLAC__EXHAUSTIVE_TESTS=no @@ -40,6 +41,10 @@ debug : FLAC__VALGRIND=FLAC__VALGRIND=no valgrind: FLAC__VALGRIND=FLAC__VALGRIND=yes release : FLAC__VALGRIND=FLAC__VALGRIND=no +debug : BUILD=debug +valgrind: BUILD=debug +release : BUILD=release + debug : all valgrind: all release : all diff --git a/test/test_bins.sh b/test/test_bins.sh index 6b01ffa..868bdf2 100755 --- a/test/test_bins.sh +++ b/test/test_bins.sh @@ -23,9 +23,23 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/flac:../obj/release/bin:../obj/debug/bin:$PATH +PATH=../src/flac:$PATH +PATH=../obj/$BUILD/bin:$PATH BINS_PATH=../../test_files/bins flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" diff --git a/test/test_flac.sh b/test/test_flac.sh index 5d10697..08cd0d1 100755 --- a/test/test_flac.sh +++ b/test/test_flac.sh @@ -23,9 +23,25 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/flac:../src/metaflac:../src/test_streams:../obj/release/bin:../obj/debug/bin:$PATH +PATH=../src/flac:$PATH +PATH=../src/metaflac:$PATH +PATH=../src/test_streams:$PATH +PATH=../obj/$BUILD/bin:$PATH flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" @@ -41,7 +57,7 @@ run_flac () run_metaflac () { if [ x"$FLAC__VALGRIND" = xyes ] ; then - 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 --logfile-fd=4 metaflac $* 4>>test_flac.valgrind.log else metaflac $* fi diff --git a/test/test_grabbag.sh b/test/test_grabbag.sh index b1dc710..2569b87 100755 --- a/test/test_grabbag.sh +++ b/test/test_grabbag.sh @@ -23,9 +23,19 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC/.libs:../src/share/grabbag/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/test_grabbag/cuesheet:../obj/release/bin:../obj/debug/bin:$PATH +PATH=../src/test_grabbag/cuesheet:$PATH +PATH=../obj/$BUILD/bin:$PATH test_cuesheet -h 1>/dev/null 2>/dev/null || die "ERROR can't find test_cuesheet executable" diff --git a/test/test_libFLAC++.sh b/test/test_libFLAC++.sh index 9bd23e3..a0f492d 100755 --- a/test/test_libFLAC++.sh +++ b/test/test_libFLAC++.sh @@ -23,10 +23,20 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC++/.libs:../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libFLAC++/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/test_libFLAC++:../obj/release/bin:../obj/debug/bin:$PATH -export PATH +PATH=../src/test_libFLAC++:$PATH +PATH=../obj/$BUILD/bin:$PATH run_test_libFLACpp () { diff --git a/test/test_libFLAC.sh b/test/test_libFLAC.sh index f663ad8..7a6a3e8 100755 --- a/test/test_libFLAC.sh +++ b/test/test_libFLAC.sh @@ -23,10 +23,19 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/test_libFLAC:../obj/release/bin:../obj/debug/bin:$PATH -export PATH +PATH=../src/test_libFLAC:$PATH +PATH=../obj/$BUILD/bin:$PATH run_test_libFLAC () { diff --git a/test/test_libOggFLAC++.sh b/test/test_libOggFLAC++.sh index 759ddeb..a470652 100755 --- a/test/test_libOggFLAC++.sh +++ b/test/test_libOggFLAC++.sh @@ -23,10 +23,21 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libOggFLAC++/.libs:../src/libOggFLAC/.libs:../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libOggFLAC++/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/test_libOggFLAC++:../obj/release/bin:../obj/debug/bin:$PATH -export PATH +PATH=../src/test_libOggFLAC++:$PATH +PATH=../obj/$BUILD/bin:$PATH run_test_libOggFLACpp () { diff --git a/test/test_libOggFLAC.sh b/test/test_libOggFLAC.sh index 21f1786..b871b97 100755 --- a/test/test_libOggFLAC.sh +++ b/test/test_libOggFLAC.sh @@ -23,10 +23,20 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libOggFLAC/.libs../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/test_libOggFLAC:../obj/release/bin:../obj/debug/bin:$PATH -export PATH +PATH=../src/test_libOggFLAC:$PATH +PATH=../obj/$BUILD/bin:$PATH run_test_libOggFLAC () { diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh index 6c5c353..0b7225d 100755 --- a/test/test_metaflac.sh +++ b/test/test_metaflac.sh @@ -23,9 +23,24 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../src/libFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/libOggFLAC/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/grabbag/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/getopt/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_analysis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/replaygain_synthesis/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../src/share/utf8/.libs:$LD_LIBRARY_PATH +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/flac:../src/metaflac:../obj/release/bin:../obj/debug/bin:$PATH +PATH=../src/flac:$PATH +PATH=../src/metaflac:$PATH +PATH=../obj/$BUILD/bin:$PATH flacfile=metaflac.flac diff --git a/test/test_streams.sh b/test/test_streams.sh index 9d0f8a8..8281e9a 100755 --- a/test/test_streams.sh +++ b/test/test_streams.sh @@ -23,9 +23,17 @@ die () exit 1 } -LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/release/lib:../obj/debug/lib:$LD_LIBRARY_PATH +if [ x = x"$1" ] ; then + BUILD=debug +else + BUILD="$1" +fi + +LD_LIBRARY_PATH=../obj/$BUILD/lib:$LD_LIBRARY_PATH export LD_LIBRARY_PATH -PATH=../src/flac:../src/test_streams:../obj/release/bin:../obj/debug/bin:$PATH +PATH=../src/flac:$PATH +PATH=../src/test_streams:$PATH +PATH=../obj/$BUILD/bin:$PATH flac --help 1>/dev/null 2>/dev/null || die "ERROR can't find flac executable" -- 2.7.4