distcheck-clean

diff --git a/server/Makefile.am b/server/Makefile.am
index e73e090ef78eab0985eee7444e4e9f27f40d437f..fc7e1d9cf537992cd407f63208d7e1e042c0b9de 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -121,7 +121,7 @@ check-decode: check-wav check-flac check-mp3
 
 check-mp3: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \
 
 check-mp3: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.mp3 | \

-         ./disorder-normalize --config test-config > mp3ed.raw
+         ./disorder-normalize --config ${srcdir}/test-config > mp3ed.raw

        cmp mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
        rm -f mp3ed.raw
 
        cmp mp3ed.raw ${top_srcdir}/sounds/scratch-mp3.raw
        rm -f mp3ed.raw
 


@@ -129,19 +129,19 @@ check-mp3: disorder-decode disorder-normalize
 # or something.  Makes it tricky to test!
 check-ogg: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \
 # or something.  Makes it tricky to test!
 check-ogg: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.ogg | \

-         ./disorder-normalize --config test-config > ogged.raw
+         ./disorder-normalize --config ${srcdir}/test-config > ogged.raw

        cmp ogged.raw ${top_srcdir}/sounds/scratch.raw
        rm -f ogged.raw
 
 check-wav: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.wav | \
        cmp ogged.raw ${top_srcdir}/sounds/scratch.raw
        rm -f ogged.raw
 
 check-wav: disorder-decode disorder-normalize
        ./disorder-decode ${top_srcdir}/sounds/scratch.wav | \

-         ./disorder-normalize --config test-config > waved.raw
+         ./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 | \
        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
+         ./disorder-normalize --config ${srcdir}/test-config > flacced.raw

        cmp flacced.raw ${top_srcdir}/sounds/scratch.raw
        rm -f flacced.raw
 
        cmp flacced.raw ${top_srcdir}/sounds/scratch.raw
        rm -f flacced.raw
 

diff --git a/sounds/Makefile.am b/sounds/Makefile.am
index a5598b7526977d558050e1ba2644572f68159973..eda07679de1d647e82a378fd7e04af0b9e863a73 100644 (file)
--- a/sounds/Makefile.am
+++ b/sounds/Makefile.am
@@ -19,4 +19,5 @@
 pkgdata_DATA=slap.ogg scratch.ogg
 
 EXTRA_DIST=${pkgdata_DATA} \
 pkgdata_DATA=slap.ogg scratch.ogg
 
 EXTRA_DIST=${pkgdata_DATA} \

-       scratch.wav scratch.flac scratch.mp3 scratch.raw long.ogg
+       scratch.wav scratch.flac scratch.mp3 scratch.raw long.ogg \
+       scratch-mp3.raw

diff --git a/tests/dtest.py b/tests/dtest.py
index 235d7467a73703fba565609ce18247f02f66148d..f17cf8e1af5a665f08ddb4cacf885bd53c26f096 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -85,7 +85,7 @@ Make track with relative path S exist"""
     trackdir = os.path.dirname(trackpath)
     if not os.path.exists(trackdir):
         os.makedirs(trackdir)
     trackdir = os.path.dirname(trackpath)
     if not os.path.exists(trackdir):
         os.makedirs(trackdir)

-    copyfile("%s/sounds/long.ogg" % top_builddir, trackpath)
+    copyfile("%s/sounds/long.ogg" % top_srcdir, trackpath)

     # We record the tracks we created so they can be tested against
     # server responses.  We put them into NFC since that's what the server
     # uses internally.
     # We record the tracks we created so they can be tested against
     # server responses.  We put them into NFC since that's what the server
     # uses internally.