typo, fix err trap for "test ...something..."

Author: mcspr

tests/common.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -u -e -E -o pipefail
+set -u -e -E -o pipefail -o errtrace
 
 cache_dir=$(mktemp -d)
 trap 'trap_exit' EXIT
@@ -9,10 +9,16 @@ function trap_exit()
 {
     # workaround for macOS shipping with broken bash
     local exit_code=$?
+
+    # ^ $cache_dir is temporary, prune when exiting
     if [ -z "${ESP8266_ARDUINO_PRESERVE_CACHE-}" ]; then
         rm -rf "$cache_dir"
     fi
 
+    if [ "$exit_code" != 0 ] ; then
+        echo "*** exit_code=$exit_code ***"
+    fi
+
     exit $exit_code
 }
 

tests/install_arduino.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env bash
 
-set -x
-
 root=$(git rev-parse --show-toplevel)
 source "$root/tests/env.sh"
 

tests/test_mkbuildoptglobals.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+trap 'echo " ${BASH_SOURCE[1]}:$LINENO $BASH_COMMAND"' ERR
+
 root=$(git rev-parse --show-toplevel)
 source "$root/tests/env.sh"
 

tests/test_mkbuildoptglobals/nobuildopt.sh

@@ -3,7 +3,7 @@ function nobuildopt()
     build_esp8266_example "Blink"
 
     local last_sketch=$(most_recent_dir "$sketches")
-    assert_build "Blink.ino" "$last_sketch" 0
+    assert_build "Blink" "$last_sketch" 0
     assert_core 0
 
     local blink_commonh_stat=$(make_commonh_stat)