Tests now use a somewhat longer track, to reduce the chance that a

track will play out before the test spots it.

diff --git a/.bzrignore b/.bzrignore
index a08805f1c5f2f90bc77c2b658f71de1c12fe1ebc..5c8238b0a73d2cfcbfc06a52b4aa8b842cbeef33 100644 (file)
--- a/.bzrignore
+++ b/.bzrignore
@@ -144,3 +144,5 @@ lib/versionstring.h
 scripts/setup
 examples/disorder.rc
 scripts/teardown
 scripts/setup
 examples/disorder.rc
 scripts/teardown

+sounds/long.ogg
+sounds/slap.raw

diff --git a/sounds/Makefile.am b/sounds/Makefile.am
index f3e9d3b49423b1d0c11655b027e264589d3900c7..bf9f33368d2a4405173b46ca64556fe4298d6b52 100644 (file)
--- a/sounds/Makefile.am
+++ b/sounds/Makefile.am
@@ -19,5 +19,16 @@
 #
 
 pkgdata_DATA=slap.ogg scratch.ogg
 #
 
 pkgdata_DATA=slap.ogg scratch.ogg

+noinst_DATA=long.ogg

 
 EXTRA_DIST=${pkgdata_DATA}
 
 EXTRA_DIST=${pkgdata_DATA}

+
+%.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

diff --git a/tests/dtest.py b/tests/dtest.py
index 3937eb6f7568ed03144269e7ee6e5c9c6100b7c3..fff18664a77c951855f3827045145cdad9132fa7 100644 (file)
--- a/tests/dtest.py
+++ b/tests/dtest.py
@@ -87,7 +87,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/slap.ogg" % top_srcdir, 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.