Test runner cleanup

test/run.bash

@@ -3,6 +3,7 @@ CIVAS=${CIVAS-../bin32/civas}
 CIVVM=${CIVVM-../bin32/civvm}
 CIVCC=${CIVCC-../bin/civicc}
 CFLAGS=${CFLAGS-}
+RUN_FUNCTIONAL=${RUN_FUNCTIONAL-1}
 
 ALIGN=52
 
@@ -146,7 +147,7 @@ function run_dir {
         check_return $f 1
     done
 
-    if [ ${RUN_FUNCTIONAL-1} -eq 1 ]; then
+    if [ $RUN_FUNCTIONAL -eq 1 ]; then
         for f in $BASE/functional/*.cvc; do
             check_output $f
         done