From c6fa95931872316a235c801a490bcd618445b530 Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Sat, 11 Jul 2015 14:06:18 -0500
Subject: [PATCH 1/3] dockerize the Travis build

Docker builds are *much* faster in Travis.

Also, we prepare to enable C++11.
---
 .travis.yml | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 17e52dc..4180688 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,13 +2,20 @@
 # http://about.travis-ci.org/docs/user/build-configuration/
 # This file can be validated on:
 # http://lint.travis-ci.org/
+# See also
+# http://stackoverflow.com/questions/22111549/travis-ci-with-clang-3-4-and-c11/30925448#30925448
+# to allow C++11, though we are not yet building with -std=c++11
 
-#before_install: sudo apt-get install -y cmake
-# cmake is pre-installed in Travis for both linux and osx
-
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq valgrind
+install:
+- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - gcc-4.8
+    - g++-4.8
+    - clang
 os:
   - linux
 language: cpp
@@ -23,3 +30,4 @@ env:
 notifications:
   email:
     - aaronjjacobs@gmail.com
+sudo: false

From 72fb4a5b08d941b631c9b5bcc104718be18c6965 Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Sat, 11 Jul 2015 14:09:52 -0500
Subject: [PATCH 2/3] valgrind in Travis

---
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index 4180688..591b354 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,6 +16,7 @@ addons:
     - gcc-4.8
     - g++-4.8
     - clang
+    - valgrind
 os:
   - linux
 language: cpp

From 138c48b7e8b370fb0e86c3a2239eaf1cc54acb2b Mon Sep 17 00:00:00 2001
From: Christopher Dunn <cdunn2001@gmail.com>
Date: Sat, 11 Jul 2015 14:27:19 -0500
Subject: [PATCH 3/3] gcc-4.6, clang-3.3

---
 .travis.yml | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 591b354..bc2f45e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,15 +7,24 @@
 # to allow C++11, though we are not yet building with -std=c++11
 
 install:
-- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+# /usr/bin/gcc is 4.6 always, but gcc-X.Y is available.
+#- if [ "$CXX" = "g++" ]; then export CXX="g++-4.8" CC="gcc-4.8"; fi
+- if [ "$CXX" = "g++" ]; then export CXX="g++-4.6" CC="gcc-4.6"; fi
+# /usr/bin/clang is our version already, and clang-X.Y does not exist.
+#- if [ "$CXX" = "clang++" ]; then export CXX="clang++-3.3" CC="clang-3.3"; fi
+- echo ${PATH}
+- ls /usr/local
+- export PATH=/usr/bin:${PATH}
+- echo ${CXX}
+- ${CXX} --version
 addons:
   apt:
     sources:
     - ubuntu-toolchain-r-test
     packages:
-    - gcc-4.8
-    - g++-4.8
-    - clang
+    - gcc-4.6
+    - g++-4.6
+    - clang-3.3
     - valgrind
 os:
   - linux