Make test protocol more brief and allow different sorting

diff --git a/Makefile b/Makefile
index 2bf9367a2932bd8cfdf556092a402ace3f423b1c..5ca40584a8c95041fa53ecb6bf807add51b0ece9 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ rule TEST_SEQ
   command = build-$$build/kcf_vot $$flags $$seq $(if $(TRAVIS),2>&1) >$$out $(if $(TRAVIS),| grep -v libdc1394); true
 rule PRINT_RESULTS
   description = Print results
-  command = ./wvtool -w131 -v run ./print-test-results $$in
+  command = ./wvtool -w120 -v run ./print-test-results $$in
 rule PLOT_RESULTS
   description = Plot results
   command = ./graphGen.sh -f -s $$in

diff --git a/print-test-results b/print-test-results
index f58705d17dd7e4fd98ff7b68b2a5e63534c5a923..4b9b1953926d3454c769ab30c3689aa6ff077070 100755 (executable)
--- a/print-test-results
+++ b/print-test-results
@@ -12,8 +12,8 @@ for i in "$@"; do
     flags=${BASH_REMATCH[3]}
     seq=${BASH_REMATCH[2]}
 
-    result=$(grep 'Average accuracy:' $i || :)
-    if [[ "$result" =~ Average\ accuracy:\ ([0-9.]+) ]]; then
+    result=$(grep 'Average accuracy:' $i | sed -e 's/Average/Avg./g' -e 's/processing //' || :)
+    if [[ "$result" =~ accuracy:\ ([0-9.]+) ]]; then
        result+=" >= ${expected_accuracy[$seq]}"
        if [[ $(echo "${BASH_REMATCH[1]} >= ${expected_accuracy[$seq]:-0}"|bc) -eq 1 ]]; then
            status=ok
@@ -24,4 +24,4 @@ for i in "$@"; do
        status=FAILED
     fi
     echo ! "$seq;$flags;$build;$result;$status"
-done | sort | column -t -s";"
+done | sort -t";" $SORT_FLAGS | column -t -s";"