From 7cbbaf80f949a10ff93938f97ca6438161ba291b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= <mat@brain-dump.org>
Date: Sat, 5 Nov 2016 23:16:53 +0100
Subject: test: disable test/vis and test/vim sets on non-Linux CI servers

---
 Makefile    | 12 ++++++------
 vim/test.sh |  5 -----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index bc7dec2..8eea917 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,15 @@
 test:
 	@$(MAKE) -C core
-	@$(MAKE) -C vim
-	@$(MAKE) -C sam
-	@$(MAKE) -C vis
 	@$(MAKE) -C lua
+	@if [ -z "$$CI" -o "$$TRAVIS_OS_NAME" = "linux" ]; then $(MAKE) -C vis; else echo "Skipping vis tests"; fi
+	@$(MAKE) -C sam
+	@if [ -z "$$CI" ]; then $(MAKE) -C vim; else echo "Skipping vim tests"; fi
 
 clean:
 	@$(MAKE) -C core clean
-	@$(MAKE) -C vim clean
-	@$(MAKE) -C sam clean
-	@$(MAKE) -C vis clean
 	@$(MAKE) -C lua clean
+	@$(MAKE) -C vis clean
+	@$(MAKE) -C sam clean
+	@$(MAKE) -C vim clean
 
 .PHONY: test clean
diff --git a/vim/test.sh b/vim/test.sh
index d353e00..e8b02c2 100755
--- a/vim/test.sh
+++ b/vim/test.sh
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-[ ! -z "$CI" ] && {
-	echo "Skipping tests in CI environment"
-	exit 0
-}
-
 [ -z "$VIS" ] && VIS="../../vis"
 [ -z "$VIM" ] && VIM="vim"
 
-- 
cgit v1.2.3