From 147396ff14e48bf94a768d706d61661d3ac09618 Mon Sep 17 00:00:00 2001
From: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Date: Thu, 21 Sep 2017 11:35:36 -0400
Subject: [PATCH] ci: bah, just move everything into `matrix:`

---
 .travis.yml | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 69b0d20f96..c7ff8c9c0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,15 +10,24 @@ matrix:
   include:
     - os: linux
       env: LINTER_ONLY=true
+      script:
+        - make lint
+    - os: linux
+      install:
+        - ./configure
+        - make -j2 V=
+      script:
+        - make -j2 test-ci
+    - os: osx
+      install:
+        - ./configure
+        - make -j2 V=
+      script:
+        - make -j2 test-ci
 before_install:
   - export HOMEBREW_NO_AUTO_UPDATE=1 # work around https://github.com/travis-ci/travis-ci/issues/7456
   - if [ $TRAVIS_OS_NAME = osx ]; then brew install ccache; fi
   - export PATH="/usr/local/opt/ccache/libexec:$PATH"
   - export CXX="ccache clang++ -Qunused-arguments"
   - export CC="ccache clang -Qunused-arguments"
-  - export JOBS=2
-install:
-  - ./configure
-  - make -j2 V=
-script:
-  - tools/run-ci.sh # do linter env variable detection
+  - export JOBS=2n