X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/bfdadcc93fcb88261478c1b04d32e619fd961a13..06f35ddcffa7e9d5a6c6b53cbb07ef11fab49f95:/server/Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 376b53f..fc7e1d9 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -117,39 +117,34 @@ check-help: all
 	./disorder-choose --help > /dev/null
 	./disorder-choose --version > /dev/null
 
-check-decode: disorder-decode disorder-normalize endian
-	echo "speaker_backend network" > config
-	echo "broadcast 127.255.255.255 9" > config
-	oggdec -b 16 -e `./endian` -R -s 1 -o oggdec.raw ${top_srcdir}/sounds/scratch.ogg
-	@$(MAKE) check-ogg
-	@$(MAKE) check-wav
-	@if which flac >/dev/null 2>&1; then $(MAKE) check-flac; fi
-	rm -f config oggdec.raw
-
-# TODO mp3 - but sox doesn't (reliably) know how to encode to it
-
-check-ogg:
+check-decode: check-wav check-flac check-mp3
+
+check-mp3: disorder-decode disorder-normalize
+	./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \
+	  ./disorder-normalize --config ${srcdir}/test-config > mp3ed.raw
+	cmp 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 config > ogged.raw
-	cmp ogged.raw oggdec.raw
+	  ./disorder-normalize --config ${srcdir}/test-config > ogged.raw
+	cmp ogged.raw ${top_srcdir}/sounds/scratch.raw
 	rm -f ogged.raw
 
-check-wav:
-	sox ${top_srcdir}/sounds/scratch.ogg scratch.wav
-	./disorder-decode scratch.wav | \
-	  ./disorder-normalize --config config > waved.raw
-	cmp waved.raw oggdec.raw
-	rm -rf scratch.wav waved.raw
-
-check-flac:
-	rm -f scratch.wav scratch.flac
-	sox ${top_srcdir}/sounds/scratch.ogg scratch.wav
-	flac scratch.wav
-	./disorder-decode scratch.flac | \
-	  ./disorder-normalize --config config > flacced.raw
-	cmp flacced.raw oggdec.raw
-	rm -f scratch.flac scratch.wav flacced.raw
-
-EXTRA_DIST=README.dbversions
+check-wav: disorder-decode disorder-normalize
+	./disorder-decode ${top_srcdir}/sounds/scratch.wav | \
+	  ./disorder-normalize --config ${srcdir}/test-config > waved.raw
+	cmp waved.raw ${top_srcdir}/sounds/scratch.raw
+	rm -rf waved.raw
+
+check-flac: disorder-decode disorder-normalize
+	./disorder-decode ${top_srcdir}/sounds/scratch.flac | \
+	  ./disorder-normalize --config ${srcdir}/test-config > flacced.raw
+	cmp flacced.raw ${top_srcdir}/sounds/scratch.raw
+	rm -f flacced.raw
+
+EXTRA_DIST=README.dbversions test-config
 
 CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html