diff tests/0010/run-test.sh @ 498:342822c2d49a

Merge api-inversion branch (-r656:771, but I don't expect to return to
that branch) into the trunk.

I expect there to be minor performance regressions (e.g. in the SOAP
server index cacheing, which I have forcibly removed) and minor
unplugged memory leaks (e.g. in audioDB::query(), where I don't free up
the datum).  I hope that these leaks and performance regressions can be
plugged in short order.  I also expect that some (but maybe not all) of
the issues currently addressed in the memory-leaks branch are superseded
or fixed by this merge.

There remains much work to be done; go forth and do it.

--- a/tests/0010/run-test.sh	Sat Jan 10 11:11:27 2009 +0000
+++ b/tests/0010/run-test.sh	Sat Jan 10 16:47:57 2009 +0000
@@ -21,29 +21,34 @@
 intstring 2 > testquery
 floatstring 0 0.5 >> testquery
 
+# because we have a tie, we treat both possible answers as correct.
+# This is the only way to preserve my sanity right now.  -- CSR,
+# 2008-12-15.
+
 ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -R 5 > testoutput
-echo testfeature01 1 > test-expected-output
-echo testfeature10 1 >> test-expected-output
-cmp testoutput test-expected-output
+echo testfeature01 1 > test-expected-output1
+echo testfeature10 1 >> test-expected-output1
+echo testfeature10 1 > test-expected-output2
+echo testfeature01 1 >> test-expected-output2
+cmp testoutput test-expected-output1 || cmp testoutput test-expected-output2
 ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 -R 5 > testoutput
-echo testfeature01 1 > test-expected-output
-cmp testoutput test-expected-output
+echo testfeature01 1 > test-expected-output1
+echo testfeature10 1 > test-expected-output2
+cmp testoutput test-expected-output1 || cmp testoutput test-expected-output2
 
 echo "query point (0.5,0.0)"
 intstring 2 > testquery
 floatstring 0.5 0 >> testquery
 
-# FIXME: because there's only one point in each track (and the query),
-# the ordering is essentially database order.  We need these test
-# cases anyway because we need to test non-segfaulting, non-empty
-# results...
-
 ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -R 5 > testoutput
-echo testfeature01 1 > test-expected-output
-echo testfeature10 1 >> test-expected-output
-cmp testoutput test-expected-output
+echo testfeature01 1 > test-expected-output1
+echo testfeature10 1 >> test-expected-output1
+echo testfeature10 1 > test-expected-output2
+echo testfeature01 1 >> test-expected-output2
+cmp testoutput test-expected-output1 || cmp testoutput test-expected-output2
 ${AUDIODB} -d testdb -Q sequence -l 1 -f testquery -r 1 -R 5 > testoutput
-echo testfeature01 1 > test-expected-output
-cmp testoutput test-expected-output
+echo testfeature01 1 > test-expected-output1
+echo testfeature10 1 > test-expected-output2
+cmp testoutput test-expected-output1 || cmp testoutput test-expected-output2
 
 exit 104