vis

commit f3b88024a73d4e63ef76cd42438aa2a2ec1c2036
parent 3b2e0e46039b5565348a78a483aa559b5dba11c0
Author: Marc André Tanner <mat@brain-dump.org>
Date:   Sat,  5 Nov 2016 23:16:53 +0100

test: disable test/vis and test/vim sets on non-Linux CI servers

Diffstat:
M
Makefile
 | 
12
++++++------
M
vim/test.sh
 | 
5
-----

2 files changed, 6 insertions(+), 11 deletions(-)
diff --git 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
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-[ ! -z "$CI" ] && {
-	echo "Skipping tests in CI environment"
-	exit 0
-}
-
 [ -z "$VIS" ] && VIS="../../vis"
 [ -z "$VIM" ] && VIM="vim"