altos: Clean up test scripts

The flight test scripts were using invalid bash syntax. Clean that up
and also switch the default flight directory to my new
~/misc/rockets/flights directory.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/src/test/run-one b/src/test/run-one
index 7d0f95aeda7c032283ba0959849dcb8c0446f2c4..8fa0787cd9c9ab71ace44e2e6e94730c02efa73e 100755 (executable)
--- a/src/test/run-one
+++ b/src/test/run-one
@@ -1,10 +1,20 @@
 #!/bin/sh
 
+DIR=~/misc/rockets/flights
+
 for i in "$@"; do
-./ao_flight_test "$i" > run-out.full
-./ao_flight_test_baro "$i" > run-out.baro
+case "$i" in
+    */*)
+    file="$i"
+    ;;
+    *)
+    file="$DIR/$i"
+    ;;
+esac
+./ao_flight_test "$file" > run-out.full
+./ao_flight_test_baro "$file" > run-out.baro
 
-#./ao_flight_test_accel "$i" > run-out.accel
+#./ao_flight_test_accel "$file" > run-out.accel
 #"run-out.accel" using 1:9 with lines lt 4 axes x1y1 title "accel height",\
 #"run-out.accel" using 1:11 with lines lt 4 axes x1y2 title "accel speed",\
 #"run-out.accel" using 1:13 with lines lt 4 axes x1y2 title "accel accel",\

diff --git a/src/test/run-tests b/src/test/run-tests
index 3e0cad3cfe6489d34bcba61247725feae13ba9c9..a8a8dc3fcea7707db64703a6475d19bde36cc55b 100755 (executable)
--- a/src/test/run-tests
+++ b/src/test/run-tests
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-DIR=~/src/cc1111/flights
+DIR=~/misc/rockets/flights
 
 bad_baro=0
 bad_full=0
@@ -8,15 +8,15 @@ while read flight description; do
     if ./ao_flight_test_baro -s $DIR/$flight; then
        :
     else
-       ((bad_baro++))
+       : $((bad_baro++))
     fi
     if ./ao_flight_test -s $DIR/$flight; then
        :
     else
-       ((bad_full++))
+       : $((bad_full++))
     fi
 done < test-flights
 echo baro errors $bad_baro
 echo full errors $bad_full
-((bad = bad_baro + bad_full))
+: $((bad = bad_baro + bad_full))
 exit $bad
\ No newline at end of file