Travis: launch nosetests after MacOS build

Clement Champetier · Clement Champetier · commit b849d531f2c5 · 2014-10-21T14:54:29.000+02:00
* Travis failed if tests failed.
* Launch tests on Linux (with ffmpeg 2.2.9) and MacOS (with ffmpeg
2.2.3).
diff --git a/.travis.yml b/.travis.yml
@@ -20,12 +20,12 @@ before_script:
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
 
 script:
+  # Build
   - mkdir build
   - cd build
   - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/dist
   - make install
-
-after_script:
+  # Launch tests
   - cd ..
   - chmod +x tools/travis.python.nosetests.sh
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.python.nosetests.sh; fi
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -3,4 +3,5 @@
 brew update
 
 brew install gcc cmake swig
-brew install ffmpeg freeglut doxygen
+brew install freeglut doxygen
+brew install bottles/ffmpeg-2.2.3.mavericks.bottle.tar.gz
