solaris 10 fixes (SF#1783225: https://sourceforge.net/tracker/index.php?func=detail...
authorJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 29 Aug 2007 00:38:16 +0000 (00:38 +0000)
committerJosh Coalson <jcoalson@users.sourceforce.net>
Wed, 29 Aug 2007 00:38:16 +0000 (00:38 +0000)
doc/html/changelog.html
test/test_metaflac.sh

index d717c7d..15867d1 100644 (file)
                                        <li>Fixed bug compiling <span class="commandname">flac</span> without Ogg support (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1760786&amp;group_id=13478&amp;atid=113478">SF #1760786</a>).</li>
                                        <li>Fixed bug where sometimes an existing installation of flac could interfere with the build process (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1763690&amp;group_id=13478&amp;atid=113478">SF #1763690</a>).</li>
                                        <li>Some MinGW fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1684879&amp;group_id=13478&amp;atid=113478">SF #1684879</a>).</li>
+                                       <li>Solaris 10 fixes (<a href="https://sourceforge.net/tracker/index.php?func=detail&amp;aid=1783225&amp;group_id=13478&amp;atid=113478">SF #1783225</a>).</li>
                                </ul>
                        </li>
                        <li>
index f39a321..f7cdedf 100755 (executable)
@@ -50,6 +50,11 @@ PATH=`pwd`/../src/flac:$PATH
 PATH=`pwd`/../src/metaflac:$PATH
 PATH=`pwd`/../obj/$BUILD/bin:$PATH
 
+if echo a | (grep -E '(a|b)') >/dev/null 2>&1
+       then EGREP='grep -E'
+       else EGREP='egrep'
+fi
+
 testdir="metaflac-test-files"
 flacfile="metaflac.flac"
 
@@ -116,7 +121,7 @@ filter ()
        # grep pattern 2: remove minimum/maximum frame and block size from STREAMINFO
        # grep pattern 3: remove hexdump data from PICTURE metadata blocks
        # sed pattern 1: remove stream offset values from SEEKTABLE points
-       grep -Ev '^  vendor string: |^  m..imum .....size: |^    0000[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]: ' | sed -e 's/, stream_offset.*//'
+       $EGREP -v '^  vendor string: |^  m..imum .....size: |^    0000[0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]: ' | sed -e 's/, stream_offset.*//'
 }
 metaflac_test ()
 {
@@ -126,7 +131,7 @@ metaflac_test ()
        expect="$testdir/$case-expect.meta"
        echo -n "test $case: $desc... "
        run_metaflac $args $flacfile | filter > $testdir/out.meta || die "ERROR running metaflac"
-       diff -q -w $expect $testdir/out.meta 2>/dev/null || die "ERROR: metadata does not match expected $expect"
+       diff -w $expect $testdir/out.meta > /dev/null 2>&1 || die "ERROR: metadata does not match expected $expect"
        echo OK
 }