Merge branch 'master' into testing-fix

[etc/vim.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 130c2afb2e015b4c594562dbc6be856551bccc14..338161ca03d40c687b5f44c56cd7e62a53b88db7 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,25 +1,34 @@
 language: vim
+
+os:
+  - linux
+  - osx
+
 env:
   - TEST=package
   - TEST=latest
 
 before_script: |
-  cd ..
   if [ "$TEST" = "package" ]; then
-    sudo apt-get -y update
-    sudo apt-get -y install vim
+    if [ "$TRAVIS_OS_NAME" = "linux" ]; then
+      sudo apt-get -y update
+      sudo apt-get -y install vim
+    fi
   else
+    cd ..
     git clone --depth 1 https://github.com/vim/vim
     cd vim
     ./configure --with-features=huge
     make
     sudo make install
     export PATH="/usr/local/bin:$PATH"
-    cd -
+    cd "$TRAVIS_BUILD_DIR"
+  fi
+  if [ "$TRAVIS_OS_NAME" = "osx" ]; then
+    curl https://bootstrap.pypa.io/get-pip.py | sudo python
   fi
-  git clone https://github.com/godlygeek/tabular
-  git clone https://github.com/junegunn/vader.vim
+  sudo -H pip install virtualenv
 
-script: |
-  cd "$TRAVIS_BUILD_DIR"
-  ./test/run-tests.sh
+script:
+  - make test
+  - make doc