X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9b6dbc0ab7a9c9e15cbcaeb5aa8db6958b33da5f..d2a6882ed727ec836d89520998918056aa355cac:/.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 9cc06e93f8..65bab09dc1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ compiler:
 #              reference to non-static member function must be called
 #                        std::uninitialized_fill( buffer_, buffer_ + size, init_value );
 #                                                                    ^~~~
+#
 addons:
   apt: # Get recent versions of the compiler, even on Ubuntu Precise
       sources:
@@ -29,12 +30,14 @@ before_install:
    - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo apt-get install -y cmake valgrind default-jdk gfortran liblua5.1-dev lua5.1 libboost-chrono1.48-dev ; fi
    - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 50 ; fi
    - if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 50 ; fi
-   - curl http://www.lua.org/ftp/lua-5.3.0.tar.gz | tar xz
-   - cd lua-5.3.0 && if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then make Linux ; else make macosx ; fi
-   - cd lua-5.3.0 && make INSTALL_TOP=$TRAVIS_BUILD_DIR/install/lua install 
-   - ls -lR $TRAVIS_BUILD_DIR/install/lua
+   - curl http://www.lua.org/ftp/lua-5.3.1.tar.gz | tar xz
+   - cd lua-5.3.1 
+   -   if [ ${TRAVIS_OS_NAME} = 'linux' ] ; then make linux ; else make macosx ; fi
+   -   make INSTALL_TOP=$TRAVIS_BUILD_DIR/LuaInstall install
+   - cd ..
+   - ls -lR $TRAVIS_BUILD_DIR/LuaInstall
 script:
-   - cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
+   - LUA_DIR=$TRAVIS_BUILD_DIR/LuaInstall cmake -Denable_documentation=OFF -Denable_coverage=OFF -Denable_java=ON -Denable_model-checking=OFF -Denable_lua=ON -Denable_compile_optimizations=ON -Denable_smpi=ON -Denable_smpi_MPICH3_testsuite=OFF -Denable_compile_warnings=ON . && make VERBOSE=1 && ctest --output-on-failure --timeout 100
 branches:
   only:
      - master