diff tests/0020/run-test.sh @ 423:b09d2eb1a2b2 api-inversion

Cheap hackery abounds.

Include an accumulator into the query_loop chain.  Somewhat
surprisingly, very few tests fail, and those that do are due to
over-specific reporting requirements in the case of ties, so rewrite
those tests to be more permissive.

There are probably codepaths which ignore the accumulator completely;
they will still work, because the accumulator will return zero points
when it is asked to ->get_points().

--- a/tests/0020/run-test.sh	Wed Dec 24 10:55:03 2008 +0000
+++ b/tests/0020/run-test.sh	Wed Dec 24 10:55:08 2008 +0000
@@ -24,12 +24,15 @@
 floatstring 0 0.5 >> testquery
 
 ${AUDIODB} -c localhost:10020 -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} -c localhost:10020 -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
 
 check_server $!
 
@@ -37,18 +40,16 @@
 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} -c localhost:10020 -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} -c localhost:10020 -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
 
 stop_server $!