From ea3b7931bdc63499e0a73feb63d2d0da13740b6c Mon Sep 17 00:00:00 2001
From: John Colvin <john.loughran.colvin@gmail.com>
Date: Fri, 18 Dec 2015 10:15:11 +0000
Subject: [PATCH] travis fixes

---
 .travis.yml | 50 ++++++++++++++++++++++++++++++++++++++++++++++++++
 README.md   |  2 ++
 2 files changed, 52 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 62d0c9e..4a49ed1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1 +1,51 @@
+sudo: required
+dist: trusty
+
 language: d
+
+os:
+  - linux
+  - osx
+
+env:
+  - ARCH=x86
+  - ARCH=x86_64
+
+# No-one cares about OS X x86
+matrix:
+  exclude:
+    - os: osx
+      env: ARCH=x86
+
+# Sort out packages
+install:
+  - |
+    if [ $TRAVIS_OS_NAME == osx ]
+    then
+      brew update
+      brew install sdl2
+    elif [ $TRAVIS_OS_NAME == linux ]
+    then
+      if [ $ARCH == x86 ]
+      then
+        sudo dpkg --add-architecture i386
+        sudo apt-get update
+        sudo apt-get install -y gcc-multilib libgl1-mesa-glx:i386 libfreetype6:i386 libsdl2-2.0-0:i386
+      else
+        sudo apt-get update
+        sudo apt-get install -y libfreetype6 libsdl2-2.0-0
+      fi
+    fi
+
+# Start a virtual x-server.
+before_script:
+  - |
+    if [ $TRAVIS_OS_NAME == linux ]
+    then
+      export DISPLAY=:99.0
+      sh -e /etc/init.d/xvfb start
+      sleep 3
+    fi
+
+script:
+  - dub test --arch=$ARCH
diff --git a/README.md b/README.md
index 4aec5e9..8bb3578 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/buggins/dlangide.svg?branch=master)](https://travis-ci.org/buggins/dlangide)
+
 Dlang IDE
 =========