a little more testing

diff --git a/clients/Makefile.am b/clients/Makefile.am
index f767025da9e7118c5c3c77c2b9aa34e9f3ae39cc..293af2d3de11f9416cb03755ed7dd86bf25a233d 100644 (file)
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -54,7 +54,7 @@ install-exec-hook:
 
 check: check-help check-completions
 
-# check everything has working --help
+# check everything has working --help and --version
 check-help: all
        ./disorder --version > /dev/null
        ./disorder --help > /dev/null

diff --git a/server/Makefile.am b/server/Makefile.am
index d1f2fd716541d0e9f72db1159149848bf7bf5810..eae90c60e49ed976020a07dae5e0252994ec70bf 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -108,15 +108,44 @@ trackname_DEPENDENCIES=../lib/libdisorder.a
 install-exec-hook:
        $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir)
 
-check: check-help
+check: check-help check-decode
 
-# check everything has working --help
+# check everything has working --help and --version
 check-help: all
        ./disorderd --help > /dev/null
+       ./disorderd --version > /dev/null
        ./disorder-dump --help > /dev/null
+       ./disorder-dump --version > /dev/null
        ./disorder-deadlock --help > /dev/null
+       ./disorder-deadlock --version > /dev/null
        ./trackname --help > /dev/null
+       ./trackname --version > /dev/null
        ./disorder-speaker --help > /dev/null
+       ./disorder-speaker --version > /dev/null
+       ./disorder-decode --help > /dev/null
+       ./disorder-decode --version > /dev/null
+       ./disorder-normalize --help > /dev/null
+       ./disorder-normalize --version > /dev/null
+       ./disorder-stats --help > /dev/null
+       ./disorder-stats --version > /dev/null
+       ./disorder-dbupgrade --help > /dev/null
+       ./disorder-dbupgrade --version > /dev/null
+       ./disorder-rescan --help > /dev/null
+       ./disorder-rescan --version > /dev/null
+
+# My sox doesn't know MP3 or FLAC unfortunately
+check-decode: disorder-decode disorder-normalize
+       echo "speaker_backend network" > config
+       echo "broadcast 127.255.255.255 discard" > config
+       ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
+         ./disorder-normalize --config config > decoded.raw
+       oggdec -b 16 -e 1 -R -s 1 -o oggdec.raw ${top_srcdir}/sounds/scratch.ogg
+       cmp decoded.raw oggdec.raw
+       sox ${top_srcdir}/sounds/scratch.ogg scratch.wav
+       ./disorder-decode scratch.wav | \
+         ./disorder-normalize --config config > decoded.raw
+       cmp decoded.raw oggdec.raw
+       rm -f scratch.wav config decoded.raw oggdec.raw
 
 cgi.o: ../lib/definitions.h