add support back in for running under .lite system

diff --git a/test/test_streams.sh b/test/test_streams.sh
index 59450f128f357a96f187556469fda247466beea2..00dc1832efcf3fdcd4ebc3ddd0d254c006563c45 100755 (executable)
--- a/test/test_streams.sh
+++ b/test/test_streams.sh
@@ -1,15 +1,14 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../src/libFLAC/.libs
+LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
+PATH=../src/flac:../src/test_streams:../obj/bin:$PATH
 
-if ../src/test_streams/test_streams ; then : ; else
+if test_streams ; then : ; else
        echo "ERROR during test_streams" 1>&2
        exit 1
 fi
 
-FLAC=../src/flac/flac
-
 test_file ()
 {
        name=$1
@@ -19,13 +18,13 @@ test_file ()
 
        echo "### ENCODE $name ########################################" >> ./encode.log
        echo -n "$name: encode..."
-       if $FLAC -s -fb -fs 44100 -fp $bps -fc $channels -0 -l 8 -m -e $encode_options $name.raw $name.flac 2>>./encode.log ; then : ; else
+       if flac -s -fb -fs 44100 -fp $bps -fc $channels -0 -l 8 -m -e $encode_options $name.raw $name.flac 2>>./encode.log ; then : ; else
                echo "ERROR during encode of $name" 1>&2
                exit 1
        fi
        echo "### DECODE $name ########################################" >> ./decode.log
        echo -n "decode..."
-       if $FLAC -s -fb -d -fr $name.flac $name.cmp 2>>./decode.log ; then : ; else
+       if flac -s -fb -d -fr $name.flac $name.cmp 2>>./decode.log ; then : ; else
                echo "ERROR during decode of $name" 1>&2
                exit 1
        fi

diff --git a/test/test_unit.sh b/test/test_unit.sh
index 0f2d0d6bc411203e8a8b5adbff8f72c0f1eaaa4b..a577f75dc7e581235d18ac58d4639c89992f4299 100755 (executable)
--- a/test/test_unit.sh
+++ b/test/test_unit.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 
-LD_LIBRARY_PATH=$LD_LIBRARY_PATH:../src/libFLAC/.libs
+LD_LIBRARY_PATH=../src/libFLAC/.libs:../obj/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH
+PATH=../src/test_unit:../obj/bin:$PATH
 
-if ../src/test_unit/test_unit ; then : ; else
+if test_unit ; then : ; else
        echo "ERROR during testgen" 1>&2
        exit 1
 fi