Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/disorder

[disorder] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 2447485081a6561fff2a3628a9534ac1c1356e54..ede49ef7d231ec3c1d329651dba95e45f5c07d3a 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -136,21 +136,19 @@ check-help: all
        ./disorder-choose --help > /dev/null
        ./disorder-choose --version > /dev/null
 
-check-decode: check-wav check-flac check-mp3
+check-decode: check-wav check-flac check-mp3 check-ogg
 
 check-mp3: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \
          ./disorder-normalize --config ${srcdir}/test-config > mp3ed.raw
-       $(top_srcdir)/scripts/compare-raw 0 \
+       $(top_srcdir)/scripts/compare-raw 64 \
                mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
        rm -f mp3ed.raw
 
-# TODO ogg decoding comes out OK but different depending on platform, version
-# or something.  Makes it tricky to test!
 check-ogg: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
          ./disorder-normalize --config ${srcdir}/test-config > ogged.raw
-       $(top_srcdir)/scripts/compare-raw 0 \
+       $(top_srcdir)/scripts/compare-raw 64 \
                ogged.raw ${top_srcdir}/sounds/scratch.raw
        rm -f ogged.raw