From b3183b11987575b6bc2a13910408265c41e2aa69 Mon Sep 17 00:00:00 2001
From: Logan Smyth <loganfsmyth@gmail.com>
Date: Mon, 26 Jun 2017 15:59:30 -0700
Subject: [PATCH] Force color output in test runs to ensure consistent behavior
 in Travis (Take 2)

---
 .travis.yml | 2 --
 Makefile    | 3 +++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1594760953..5e581d516a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ node_js:
 
 env:
   - JOB=test
-  # Hacky fix until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
-  - FORCE_COLOR=true
 
 script:
   - 'if [ "$JOB" = "test" ]; then make test-ci; fi'
diff --git a/Makefile b/Makefile
index 57c978c8d0..46d5c71c57 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ MAKEFLAGS = -j1
 
 export NODE_ENV = test
 
+# Fix color output until TravisCI fixes https://github.com/travis-ci/travis-ci/issues/7967
+export FORCE_COLOR = true
+
 .PHONY: build build-dist watch lint fix clean test-clean test-only test test-ci publish bootstrap
 
 build: clean