From 8d7d07c20203cd43745eb6a579d0731c2de8cd33 Mon Sep 17 00:00:00 2001
From: Kelvin Lawson <kelvinl@users.sf.net>
Date: Wed, 13 Jul 2016 10:43:13 +0100
Subject: [PATCH] Separate scripts for AVR and QEMU-ARM commit hooks.

---
 .travis.yml                                    |  4 +++-
 tests/{commit-tests.sh => commit-tests-avr.sh} |  7 -------
 tests/commit-tests-qemu-arm.sh                 | 13 +++++++++++++
 3 files changed, 16 insertions(+), 8 deletions(-)
 rename tests/{commit-tests.sh => commit-tests-avr.sh} (65%)
 create mode 100755 tests/commit-tests-qemu-arm.sh

diff --git a/.travis.yml b/.travis.yml
index c7dd518..4e7dab2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,6 +7,8 @@ services:
 
 before_install:
 - docker pull kelvinlawson/atomthreads
+- docker pull kelvinlawson/atomthreads-cortex-m
 
 script:
-- docker run --rm -v $TRAVIS_BUILD_DIR/:/data -t kelvinlawson/atomthreads /data/tests/commit-tests.sh
+    - docker run --rm -v $TRAVIS_BUILD_DIR/:/data -t kelvinlawson/atomthreads /data/tests/commit-tests-qemu-arm.sh
+    - docker run --rm -v $TRAVIS_BUILD_DIR/:/data -t kelvinlawson/atomthreads /data/tests/commit-tests-avr.sh
diff --git a/tests/commit-tests.sh b/tests/commit-tests-avr.sh
similarity index 65%
rename from tests/commit-tests.sh
rename to tests/commit-tests-avr.sh
index b5af07e..13ca020 100755
--- a/tests/commit-tests.sh
+++ b/tests/commit-tests-avr.sh
@@ -12,10 +12,3 @@ make clean
 make PART=atmega128
 make PART=atmega128 simtests
 cd ../..
-
-# Build qemu-arm and run tests
-cd ports/arm/platforms/qemu_integratorcp
-make clean
-make
-make qemutests
-
diff --git a/tests/commit-tests-qemu-arm.sh b/tests/commit-tests-qemu-arm.sh
new file mode 100755
index 0000000..c7790c5
--- /dev/null
+++ b/tests/commit-tests-qemu-arm.sh
@@ -0,0 +1,13 @@
+#!/bin/bash 
+
+# Quit on any error
+set -e
+
+# Start at top-level directory
+cd `dirname $0`/..
+
+# Build qemu-arm and run tests
+cd ports/arm/platforms/qemu_integratorcp
+make clean
+make
+make qemutests