Decoder tests no longer depend on being able to run oggdec etc.

diff --git a/.bzrignore b/.bzrignore
index 21c00de21f16faa083d901db6ca8bbe9cf0d1d0f..0cb8173e69789522b595b5615377a6adb28dd9b1 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -143,8 +143,6 @@ lib/versionstring.h
 scripts/setup
 examples/disorder.rc
 scripts/teardown
 scripts/setup
 examples/disorder.rc
 scripts/teardown

-sounds/long.ogg
-sounds/slap.raw

 server/disorder-choose
 libtests/t-addr
 libtests/t-basen
 server/disorder-choose
 libtests/t-addr
 libtests/t-basen

diff --git a/server/Makefile.am b/server/Makefile.am
index 376b53f87e690ff528cdccea6bef6b1d24d9639c..358d2cc9757d1146143bc147ac7eb0146c5695fe 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -117,39 +117,33 @@ check-help: all
        ./disorder-choose --help > /dev/null
        ./disorder-choose --version > /dev/null
 
        ./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-ogg check-wav check-flac
+
+# TODO!
+check-mp3: disorder-decode disorder-normalize
+       ./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \
+         ./disorder-normalize --config test-config > mp3ed.raw
+       cmp mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
+       rm -f mp3ed.raw
+
+check-ogg: disorder-decode disorder-normalize

        ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
        ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \

-         ./disorder-normalize --config config > ogged.raw
-       cmp ogged.raw oggdec.raw
+         ./disorder-normalize --config test-config > ogged.raw
+       cmp ogged.raw ${top_srcdir}/sounds/scratch.raw

        rm -f ogged.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 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 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
 
 CLEANFILES=*.gcda *.gcov *.gcno *.c.html index.html

diff --git a/server/test-config b/server/test-config
new file mode 100644 (file)
index 0000000..8cdd179
--- /dev/null
+++ b/server/test-config
@@ -0,0 +1,6 @@
+# Dummy config file for decoder testing
+
+api command
+speaker_command true
+sample_format 16b/44100/2
+

diff --git a/sounds/Makefile.am b/sounds/Makefile.am
index f91d194615be5b1907633cffa94f39a5dbcb9ca1..a5598b7526977d558050e1ba2644572f68159973 100644 (file)
--- a/sounds/Makefile.am
+++ b/sounds/Makefile.am
@@ -18,16 +18,5 @@
 
 pkgdata_DATA=slap.ogg scratch.ogg
 
 
 pkgdata_DATA=slap.ogg scratch.ogg
 

-EXTRA_DIST=${pkgdata_DATA}
-
-check: long.ogg
-
-%.raw: %.ogg
-       oggdec -b16 -R -o $@ $<
-
-long.ogg: slap.raw
-       cat slap.raw slap.raw slap.raw slap.raw slap.raw slap.raw \
-               slap.raw slap.raw | oggenc -r -o $@ -
-
-clean-local:
-       rm -f long.ogg slap.raw
+EXTRA_DIST=${pkgdata_DATA} \
+       scratch.wav scratch.flac scratch.mp3 scratch.raw long.ogg

diff --git a/sounds/long.ogg b/sounds/long.ogg
new file mode 100644 (file)
index 0000000..977f96a
Binary files /dev/null and b/sounds/long.ogg differ

diff --git a/sounds/scratch.flac b/sounds/scratch.flac
new file mode 100644 (file)
index 0000000..4d1df45
Binary files /dev/null and b/sounds/scratch.flac differ

diff --git a/sounds/scratch.mp3 b/sounds/scratch.mp3
new file mode 100644 (file)
index 0000000..ee915a2
Binary files /dev/null and b/sounds/scratch.mp3 differ

diff --git a/sounds/scratch.raw b/sounds/scratch.raw
new file mode 100644 (file)
index 0000000..1564205
Binary files /dev/null and b/sounds/scratch.raw differ

diff --git a/sounds/scratch.wav b/sounds/scratch.wav
new file mode 100644 (file)
index 0000000..28be862
Binary files /dev/null and b/sounds/scratch.wav differ