ref: 654067918365a583e01dc1044e5e30344c82d49e
parent: 174327628a3190c74adc334c828068ee801b2a07
author: cbagwell <cbagwell>
date: Mon Oct 1 21:52:11 EDT 2007
distcheck target now runs test scripts. Bump to 14.0.1.
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
o Fix Sndtool read error causing noise at start. (Reynir Stefansson)
o Fix loss of 1 decoded FLAC block when using "trim 0 ...". (robs)
+ o Let "make distcheck" run some automated test scripts.
+ o Distribute missing cmake files.
+ o Fix ogg vorbis compile error on some platforms.
sox-14.0.0
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(SoX, 14.0.0, sox-devel@lists.sourceforge.net)
+AC_INIT(SoX, 14.0.1, sox-devel@lists.sourceforge.net)
dnl Find target architecture
AC_CANONICAL_TARGET
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -297,6 +297,7 @@
clean-local:
$(RM) play rec
+ $(RM) sox_sample_test
distclean-local:
$(RM) soxstdint.h
@@ -304,8 +305,7 @@
# Ideally we would use the "check" target so that "make distcheck"
# would run the test suite, but an uninstalled libltdl build cannot
# currently load its formats and effects, so the checks would fail.
-# TODO: Make this installcheck again. Scripts don't work because
-# of use of "./".
-local-installcheck:
- $(srcdir)/tests.sh
- $(srcdir)/testall.sh
+installcheck:
+ $(srcdir)/tests.sh --bindir=${bindir} --builddir=${builddir} --srcdir=${srcdir}+ $(srcdir)/testall.sh --bindir=${bindir} --srcdir=${srcdir}+
--- a/src/testall.sh
+++ b/src/testall.sh
@@ -1,4 +1,35 @@
-effect="$*"
+bindir="."
+srcdir="."
+effect=""
+
+# Allow user to override paths. Useful for testing an installed
+# sox.
+while [ $# -ne 0 ]; do
+ case "$1" in
+ --bindir=*)
+ bindir=`echo $1 | sed 's/.*=//'`
+ ;;
+
+ -i)
+ shift
+ bindir=$1
+ ;;
+
+ --srcdir=*)
+ srcdir=`echo $1 | sed 's/.*=//'`
+ ;;
+
+ -c)
+ shift
+ srcdir=$1
+ ;;
+
+ *)
+ effect="$effect $1"
+ esac
+ shift
+done
+
t() {format=$1
shift
@@ -5,8 +36,8 @@
opts="$*"
echo "Format: $format Options: $opts"
- ./sox monkey.wav $opts /tmp/monkey.$format $effect
- ./sox $opts /tmp/monkey.$format /tmp/monkey1.wav $effect
+ ${bindir}/sox ${srcdir}/monkey.wav $opts /tmp/monkey.$format $effect+ ${bindir}/sox $opts /tmp/monkey.$format /tmp/monkey1.wav $effect}
t 8svx
t aiff
--- a/src/tests.sh
+++ b/src/tests.sh
@@ -6,6 +6,48 @@
#verbose=-V
#all=all
+bindir="."
+builddir="."
+srcdir="."
+
+# Allow user to override paths. Useful for testing an installed
+# sox.
+while [ $# -ne 0 ]; do
+ case "$1" in
+ --bindir=*)
+ bindir=`echo $1 | sed 's/.*=//'`
+ ;;
+
+ -i)
+ shift
+ bindir=$1
+ ;;
+
+ --builddir=*)
+ builddir=`echo $1 | sed 's/.*=//'`
+ ;;
+
+ -b)
+ shift
+ builddir=$1
+ ;;
+
+ --srcdir=*)
+ srcdir=`echo $1 | sed 's/.*=//'`
+ ;;
+
+ -c)
+ shift
+ srcdir=$1
+ ;;
+
+ *)
+ echo "Unknown option"
+ exit 1
+ esac
+ shift
+done
+
getFormat () {formatExt=$1; formatText=$1; formatFlags=""
case $1 in
@@ -35,12 +77,12 @@
if [ "${format1_skip}x" = "x" -a "${from_skip}x" = "x" ] ; then getFormat ${format1}; format1Ext=$formatExt; format1Text=$formatText; format1Flags=$formatFlagsgetFormat $1; format2Ext=$formatExt; format2Text=$formatText; format2Flags=$formatFlags
- echo ./sox -c $channels -r $rate -n $format1Flags input.$format1Ext synth $samples's' sin 300-3300 noise trapezium
- echo ./sox $verbose -r $rate -c $channels $format1Flags input.$format1Ext $format2Flags intermediate.$format2Ext
- echo ./sox $verbose -r $rate -c $channels $format2Flags intermediate.$format2Ext $format1Flags output.$format1Ext
- ./sox -R -c $channels -r $rate -n $format1Flags input.$format1Ext synth $samples's' sin 300-3300 noise trapezium
- ./sox $verbose -r $rate -c $channels $format1Flags input.$format1Ext $format2Flags intermediate.$format2Ext
- ./sox $verbose -r $rate -c $channels $format2Flags intermediate.$format2Ext $format1Flags output.$format1Ext
+ echo ${bindir}/sox -c $channels -r $rate -n $format1Flags input.$format1Ext synth $samples's' sin 300-3300 noise trapezium+ echo ${bindir}/sox $verbose -r $rate -c $channels $format1Flags input.$format1Ext $format2Flags intermediate.$format2Ext+ echo ${bindir}/sox $verbose -r $rate -c $channels $format2Flags intermediate.$format2Ext $format1Flags output.$format1Ext+ ${bindir}/sox -R -c $channels -r $rate -n $format1Flags input.$format1Ext synth $samples's' sin 300-3300 noise trapezium+ ${bindir}/sox $verbose -r $rate -c $channels $format1Flags input.$format1Ext $format2Flags intermediate.$format2Ext+ ${bindir}/sox $verbose -r $rate -c $channels $format2Flags intermediate.$format2Ext $format1Flags output.$format1ExtintermediateReference=intermediate`echo "$channels $rate $format1Flags $format1Ext $format2Flags"|tr " " "_"`.$format2Ext
# Uncomment to generate new reference files
@@ -125,10 +167,10 @@
fi
if [ "${from_skip}x" = "x" ] ; thengetFormat $1;
- echo ./sox -c $channels -r $rate -n $formatFlags input.$1 synth $samples's' sin 300-3300 noise trapezium
- echo time ./sox $verbose -r $rate -c $channels $formatFlags input.$1 $formatFlags output.$1
- ./sox -c $channels -r $rate -n $formatFlags input.$1 synth $samples's' sin 300-3300 noise trapezium
- time ./sox $verbose -r $rate -c $channels $formatFlags input.$1 $formatFlags output.$1
+ echo ${bindir}/sox -c $channels -r $rate -n $formatFlags input.$1 synth $samples's' sin 300-3300 noise trapezium+ echo time ${bindir}/sox $verbose -r $rate -c $channels $formatFlags input.$1 $formatFlags output.$1+ ${bindir}/sox -c $channels -r $rate -n $formatFlags input.$1 synth $samples's' sin 300-3300 noise trapezium+ time ${bindir}/sox $verbose -r $rate -c $channels $formatFlags input.$1 $formatFlags output.$1rm -f input.$1 output.$1
fi
@@ -140,11 +182,11 @@
# Run tests
make sox_sample_test
-./sox_sample_test || exit 1
+${builddir}/sox_sample_test || exit 1-./sox --help | grep -q "flac" || skip="flac $skip"
+${bindir}/sox --help | grep -q "flac" || skip="flac $skip"grep -q "^OGG_LIBS *= *-logg" Makefile || skip="ogg $skip"
-grep -q "^#define HAVE_SNDFILE_H" soxconfig.h || skip="caf $skip"
+grep -q "^#define HAVE_SNDFILE_H" ${builddir}/src/soxconfig.h || skip="caf $skip"rate=44100
samples=23493
@@ -167,7 +209,7 @@
fi
do_singlechannel_formats
-./amr-wb-test
+${srcdir}/amr-wb-testif [ $? -eq 0 ]; then
echo "ok amr-wb"
else
@@ -179,7 +221,7 @@
samples=10000000
timeIO s1 u1 s2 u2 s3 u3 s4 u4 raw Raw au wav aiff aifc caf sph # FIXME?: flac dat
-./sox -c 1 -n output.u1 synth .01 vol .5
+${bindir}/sox -c 1 -n output.u1 synth .01 vol .5if [ `wc -c <output.u1` = 441 ]; then
echo "ok synth size"
else