diff tests/0007/run-test.sh @ 54:f258a0258755

Just testing for failure exit codes doesn't distinguish between a clean
error exit and a segfault.  Define a shell function for clean error
exit, and use it everywhere.

--- a/tests/0007/run-test.sh	Thu Sep 20 08:50:35 2007 +0000
+++ b/tests/0007/run-test.sh	Thu Sep 20 09:52:16 2007 +0000
@@ -2,17 +2,13 @@
 
 . ../test-utils.sh
 
-# this is the same as tests/0006, except without the -l 1 to ask for a
-# sequence search of length 1; as of 2007-09-19, this causes
-# segfaults.  The default behaviour might not be to work completely
-# without the -l 1, but it shouldn't segfault.  (There's not much
-# that's sensible other than defaulting to -l 1, because the query
-# feature file is of length 1).
-
 if [ -f testdb ]; then rm -f testdb; fi
 
 ${AUDIODB} -d testdb -N
 
+# tests that the lack of -l when the query sequence is shorter doesn't
+# segfault.
+
 intstring 2 > testfeature
 floatstring 0 1 >> testfeature
 floatstring 1 0 >> testfeature
@@ -26,22 +22,14 @@
 intstring 2 > testquery
 floatstring 0 0.5 >> testquery
 
-${AUDIODB} -d testdb -Q sequence -f testquery > testoutput
-echo testfeature 1 0 0 > test-expected-output
-cmp testoutput test-expected-output
-${AUDIODB} -d testdb -Q sequence -f testquery -n 1 > testoutput
-echo testfeature 0 0 0 > test-expected-output
-cmp testoutput test-expected-output
+expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery
+expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery -n 1
 
 echo "query point (0.5,0.0)"
 intstring 2 > testquery
 floatstring 0.5 0 >> testquery
 
-${AUDIODB} -d testdb -Q sequence -f testquery > testoutput
-echo testfeature 1 0 1 > test-expected-output
-cmp testoutput test-expected-output
-${AUDIODB} -d testdb -Q sequence -f testquery -n 1 > testoutput
-echo testfeature 0 0 1 > test-expected-output
-cmp testoutput test-expected-output
+expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery
+expect_clean_error_exit ${AUDIODB} -d testdb -Q sequence -f testquery -n 1
 
 exit 104