From 412a03752ea12d748e2413248f753d72b326bdb5 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Wed, 29 Aug 2007 00:38:16 +0000 Subject: [PATCH] solaris 10 fixes (SF#1783225: https://sourceforge.net/tracker/index.php?func=detail&aid=1783225&group_id=13478&atid=113478) --- doc/html/changelog.html | 1 + test/test_metaflac.sh | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/doc/html/changelog.html b/doc/html/changelog.html index d717c7da..15867d1f 100644 --- a/doc/html/changelog.html +++ b/doc/html/changelog.html @@ -104,6 +104,7 @@
  • Fixed bug compiling flac without Ogg support (SF #1760786).
  • Fixed bug where sometimes an existing installation of flac could interfere with the build process (SF #1763690).
  • Some MinGW fixes (SF #1684879).
    • +
  • Solaris 10 fixes (SF #1783225).
  • diff --git a/test/test_metaflac.sh b/test/test_metaflac.sh index f39a3216..f7cdedfa 100755 --- a/test/test_metaflac.sh +++ b/test/test_metaflac.sh @@ -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 }