4 files changed, 53 insertions, 4 deletions
diff --git a/tests/script/bootstrap.sh b/tests/script/bootstrap.sh
index 083bf5d..0dbd7b2 100755
--- a/tests/script/bootstrap.sh
+++ b/tests/script/bootstrap.sh
@@ -7,3 +7,4 @@ pushd $SCRIPTS_DIR/..
 
 source $SCRIPTS_DIR/bootstrap/chipkit.sh
 source $SCRIPTS_DIR/bootstrap/arduino.sh
+source $SCRIPTS_DIR/bootstrap/samd.sh
diff --git a/tests/script/bootstrap/arduino.sh b/tests/script/bootstrap/arduino.sh
index 7c2c9ac..371c0ef 100644
--- a/tests/script/bootstrap/arduino.sh
+++ b/tests/script/bootstrap/arduino.sh
@@ -8,7 +8,8 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
 
     echo "Installing Arduino..."
 
-    ARDUINO_BASENAME="arduino-1.0.6"
+    ARDUINO_BASENAME="arduino-1.8.11"
+
     if [ $OS == "cygwin" ]; then
         ARDUINO_FILE="$ARDUINO_BASENAME-windows".zip
         EXTRACT_COMMAND="unzip -q"
@@ -16,8 +17,8 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
         ARDUINO_FILE="$ARDUINO_BASENAME-macosx".zip
         EXTRACT_COMMAND="unzip -q"
     else
-        ARDUINO_FILE="$ARDUINO_BASENAME-linux64".tgz
-        EXTRACT_COMMAND="tar -xzf"
+        ARDUINO_FILE="$ARDUINO_BASENAME-linux64".tar.xz
+        EXTRACT_COMMAND="tar -xf"
     fi
 
     ARDUINO_URL=http://arduino.cc/download.php?f=/$ARDUINO_FILE
@@ -33,6 +34,7 @@ if [ -z "$ARDUINO_DIR" ] || ! test -e $ARDUINO_DIR || [ $OS == "cygwin" ]; then
     then
         echo "Installing Arduino to local folder..."
         $EXTRACT_COMMAND $ARDUINO_FILE
+        mv $ARDUINO_BASENAME arduino
         echo "Arduino installed"
     fi
 
diff --git a/tests/script/bootstrap/samd.sh b/tests/script/bootstrap/samd.sh
new file mode 100644
index 0000000..fdd50f5
--- /dev/null
+++ b/tests/script/bootstrap/samd.sh
@@ -0,0 +1,46 @@
+set -e
+BOOTSTRAP_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+source $BOOTSTRAP_DIR/common.sh
+
+echo "Installing dependencies for building for the SAMD boards"
+
+# these extract to dirs without versions...
+SAMD_PACKAGE="samd-1.8.6"
+CMSIS_PACKAGE="CMSIS-4.5.0"
+CMSIS_ATMEL_PACKAGE="CMSIS-Atmel-1.2.0"
+
+if [ $OS == "mac" ]; then
+  TOOLCHAIN_PACKAGE="gcc-arm-none-eabi-7-2017-q4-major-mac"
+else
+  TOOLCHAIN_PACKAGE="gcc-arm-none-eabi-7-2017-q4-major-linux"
+fi
+
+ARDUINO_URL=https://downloads.arduino.cc
+TOOLCHAIN_URL=https://developer.arm.com/-/media/Files/downloads/gnu-rm/7-2017q4
+
+EXTRACT_COMMAND="tar -xjf"
+
+_pushd $DEPENDENCIES_FOLDER
+if ! test -e $SAMD_PACKAGE
+then
+    echo "Downloading SAMD packages..."
+    download $ARDUINO_URL/cores/$SAMD_PACKAGE.tar.bz2 $SAMD_PACKAGE.tar.bz2
+    download $ARDUINO_URL/$CMSIS_PACKAGE.tar.bz2 $CMSIS_PACKAGE.tar.bz2
+    download $ARDUINO_URL/$CMSIS_ATMEL_PACKAGE.tar.bz2 $CMSIS_ATMEL_PACKAGE.tar.bz2
+    download $TOOLCHAIN_URL/$TOOLCHAIN_PACKAGE.tar.bz2 $TOOLCHAIN_PACKAGE.tar.bz2
+fi
+
+if ! test -d $SAMD_PACKAGE
+then
+    echo "Installing packages to local folder..."
+    $EXTRACT_COMMAND $SAMD_PACKAGE.tar.bz2
+    $EXTRACT_COMMAND $CMSIS_PACKAGE.tar.bz2
+    $EXTRACT_COMMAND $CMSIS_ATMEL_PACKAGE.tar.bz2
+    $EXTRACT_COMMAND $TOOLCHAIN_PACKAGE.tar.bz2
+    echo "SAMD support installed"
+fi
+
+_popd
+
+echo
+echo "${bldgreen}SAMD dependencies installed.$txtrst"
diff --git a/tests/script/runtests.sh b/tests/script/runtests.sh
index fd05c30..ba75fe4 100755
--- a/tests/script/runtests.sh
+++ b/tests/script/runtests.sh
@@ -7,7 +7,7 @@ failures=()
 # These examples cannot be tested easily at the moment as they require
 # alternate cores. The MakefileExample doesn't actually contain any source code
 # to compile.
-NON_TESTABLE_EXAMPLES=(ATtinyBlink MakefileExample TinySoftWareSerial BlinkOpenCM BlinkOpenCR BlinkTeensy BlinkNetworkRPi BlinkInAVRC MZeroBlink ZeroBlink DueBlink)
+NON_TESTABLE_EXAMPLES=(ATtinyBlink MakefileExample TinySoftWareSerial BlinkOpenCM BlinkOpenCR BlinkTeensy BlinkNetworkRPi BlinkInAVRC DueBlink)
 
 for dir in $TESTS_DIR/*/
 do