diff options
| author | Marc André Tanner <mat@brain-dump.org> | 2016-11-05 23:16:53 +0100 |
|---|---|---|
| committer | Marc André Tanner <mat@brain-dump.org> | 2016-11-05 23:24:57 +0100 |
| commit | 7cbbaf80f949a10ff93938f97ca6438161ba291b (patch) | |
| tree | 99d17f4a3e203f8a5dbf063ded3ec6bb7c382a2c | |
| parent | b9ceda978bf9beaff19c69f59d1421103c490f7a (diff) | |
| download | vis-7cbbaf80f949a10ff93938f97ca6438161ba291b.tar.gz vis-7cbbaf80f949a10ff93938f97ca6438161ba291b.tar.xz | |
test: disable test/vis and test/vim sets on non-Linux CI servers
| -rw-r--r-- | Makefile | 12 | ||||
| -rwxr-xr-x | vim/test.sh | 5 |
2 files changed, 6 insertions, 11 deletions
@@ -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" |