parent
52032dc14b
commit
ed83c39807
2 changed files with 5 additions and 4 deletions
|
@ -59,6 +59,7 @@ script:
|
||||||
./autogen.sh;
|
./autogen.sh;
|
||||||
./configure --enable-debug || cat config.log;
|
./configure --enable-debug || cat config.log;
|
||||||
make -j2 || travis_terminate 1;
|
make -j2 || travis_terminate 1;
|
||||||
|
make test || travis_terminate 1;
|
||||||
elif [ "$BUILD_SUIT" = "autotools" ]; then
|
elif [ "$BUILD_SUIT" = "autotools" ]; then
|
||||||
export CPPFLAGS="-fprofile-arcs -ftest-coverage";
|
export CPPFLAGS="-fprofile-arcs -ftest-coverage";
|
||||||
export LIBS="-lgcov";
|
export LIBS="-lgcov";
|
||||||
|
|
|
@ -3,11 +3,8 @@
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
if [ $TRAVIS_OS_NAME = 'osx' ]; then
|
if [ $TRAVIS_OS_NAME = 'osx' ]; then
|
||||||
brew install autoconf ffmpeg freetype gettext ffms2 fftw fribidi libass m4 icu4c boost wxmac lua
|
brew install autoconf ffmpeg freetype gettext ffms2 fftw fribidi libass m4 icu4c boost wxmac lua luarocks
|
||||||
else
|
else
|
||||||
sudo luarocks install busted > /dev/null
|
|
||||||
sudo luarocks install moonscript > /dev/null
|
|
||||||
sudo luarocks install uuid > /dev/null
|
|
||||||
# Remove the CMake provided by travis
|
# Remove the CMake provided by travis
|
||||||
sudo rm -rf /usr/local/cmake*
|
sudo rm -rf /usr/local/cmake*
|
||||||
if [ "$BUILD_SUIT" = "autotools" ]; then
|
if [ "$BUILD_SUIT" = "autotools" ]; then
|
||||||
|
@ -21,3 +18,6 @@ else
|
||||||
popd;
|
popd;
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
sudo luarocks install busted > /dev/null
|
||||||
|
sudo luarocks install moonscript > /dev/null
|
||||||
|
sudo luarocks install uuid > /dev/null
|
||||||
|
|
Loading…
Reference in a new issue