From 96c18741317abda5d111acab4a91b1f5f8043319 Mon Sep 17 00:00:00 2001
From: Tim 'mithro' Ansell <me@mith.ro>
Date: Thu, 10 Jan 2019 18:51:47 -0800
Subject: [PATCH] infra: Make travis run tests

Signed-off-by: Tim 'mithro' Ansell <me@mith.ro>
---
 .travis.yml | 43 ++++++++++++++++++++++---------------------
 Makefile    |  1 +
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8c93d3f0..48204714 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,6 @@
 matrix:
   include:
-    # Job 1) Test C++ w/ GCC
-    - os: linux
-      dist: trusty
-      language: cpp
-      addons:
-        apt:
-          sources:
-            - ubuntu-toolchain-r-test
-          packages:
-            - g++-6
-      script:
-        - export CC=gcc-6
-        - export CXX=g++-6
-        - mkdir -p build
-        - pushd build
-        - cmake -DPRJXRAY_BUILD_TESTING=ON ..
-        - make -j 4
-        - ctest
-    # Job 2) Lint checks on Python and C++
+    # Job 1) Runs the tests
     - os: linux
       dist: trusty
       language: python
@@ -27,16 +9,35 @@ matrix:
         apt:
           sources:
             - ubuntu-toolchain-r-test
+          packages:
+            - g++-6
+      install:
+        - export CC=gcc-6
+        - export CXX=g++-6
+        - make env
+      script:
+        - export CC=gcc-6
+        - export CXX=g++-6
+        - make test
+    # Job 2) Checks the formatting
+    - os: linux
+      dist: trusty
+      language: python
+      python: 3.6
+      addons:
+        apt:
+          sources:
             - llvm-toolchain-trusty-5.0
+            - ubuntu-toolchain-r-test
           packages:
             - clang-format-5.0
             - g++-6
       install:
         - export CC=gcc-6
         - export CXX=g++-6
-        - pip install -r requirements.txt
+        - make env
       script:
         - export CC=gcc-6
         - export CXX=g++-6
         - make format
-        - test $(git status --porcelain | wc -l) -eq 0 || { git diff; false; } 
+        - test $(git status --porcelain | wc -l) -eq 0 || { git diff; false; }
diff --git a/Makefile b/Makefile
index aeb881cf..acb9c25d 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ IN_ENV = if [ -e env/bin/activate ]; then . env/bin/activate; fi;
 env:
 	virtualenv --python=python3 --system-site-packages env
 	$(IN_ENV) pip install -r requirements.txt
+	$(IN_ENV) pip install -r docs/requirements.txt
 	ln -sf $(PWD)/prjxray env/lib/python3.*/site-packages/
 	ln -sf $(PWD)/third_party/fasm/fasm.py env/lib/python3.*/site-packages/
 	$(IN_ENV) python -c "import yaml" || (echo "Unable to find python-yaml" && exit 1)