From: Martin Quinson <martin.quinson@loria.fr>
Date: Fri, 16 Oct 2015 19:50:44 +0000 (+0200)
Subject: [travis] fixups
X-Git-Tag: v3_13~1675
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/deb5b356b8096d7ec29c46ad60eef6d218f3382c

[travis] fixups
---

diff --git a/.travis.yml b/.travis.yml
index 9cc06e93f8..b5fabae4df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,9 +30,11 @@ before_install:
    - 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
+   - cd lua-5.3.0 
+   -   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
 branches: