diff --git a/.travis.yml b/.travis.yml index 9a579b2..d8330aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,49 +18,9 @@ before_install: sudo add-apt-repository ppa:mwild1/ppa -y && sudo apt-get update -y; fi -install: - - sudo apt-get install libzmq3-dev -y - - sudo apt-get install $LUA -y - - sudo apt-get install $LIBLUA -y - - LUA_LIBDIR=`pkg-config $LUA --variable=libdir` - - INSTALL_LMOD=`pkg-config $LUA --variable=INSTALL_LMOD` - - INSTALL_CMOD=`pkg-config $LUA --variable=INSTALL_CMOD` - ## make sure there is a 'lua' command. - - if [ ! -x /usr/bin/lua ]; then - sudo ln -s `which $LUA` /usr/bin/lua; - fi - ## install lua-llthreads - - git clone git://github.com/Neopallium/lua-llthreads.git - - cd lua-llthreads ; mkdir build ; cd build - - cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR - -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD - - make - - sudo make install - - cd ../.. +install: ./scripts/travis_install.sh -script: - #### build using pre-generated bindings. - - mkdir build; cd build - - cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR - -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD - - make - - sudo make install - # Run tests. - - $LUA ../tests/test_inproc.lua - - $LUA ../perf/thread_lat.lua 1 1000 - - cd .. ; rm -rf build - #### Re-Generate bindings. - - git clone git://github.com/Neopallium/LuaNativeObjects.git; - - mkdir build; cd build - - cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR - -DLUA_NATIVE_OBJECTS_PATH=$TRAVIS_BUILD_DIR/LuaNativeObjects - -DUSE_PRE_GENERATED_BINDINGS=OFF -DGENERATE_LUADOCS=OFF - -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD - - make - - sudo make install - # Run tests. - - $LUA ../tests/test_inproc.lua - - $LUA ../perf/thread_lat.lua 1 1000 +script: ./scripts/travis_build.sh notifications: email: diff --git a/scripts/travis_build.sh b/scripts/travis_build.sh new file mode 100644 index 0000000..5aea200 --- /dev/null +++ b/scripts/travis_build.sh @@ -0,0 +1,23 @@ +#### build using pre-generated bindings. +mkdir build; cd build +cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR + -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD +make +sudo make install +# Run tests. +$LUA ../tests/test_inproc.lua +$LUA ../perf/thread_lat.lua 1 1000 +cd .. ; rm -rf build +#### Re-Generate bindings. +git clone git://github.com/Neopallium/LuaNativeObjects.git; +mkdir build; cd build +cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR + -DLUA_NATIVE_OBJECTS_PATH=$TRAVIS_BUILD_DIR/LuaNativeObjects + -DUSE_PRE_GENERATED_BINDINGS=OFF -DGENERATE_LUADOCS=OFF + -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD +make +sudo make install +# Run tests. +$LUA ../tests/test_inproc.lua +$LUA ../perf/thread_lat.lua 1 1000 + diff --git a/scripts/travis_install.sh b/scripts/travis_install.sh new file mode 100644 index 0000000..6d3f210 --- /dev/null +++ b/scripts/travis_install.sh @@ -0,0 +1,22 @@ +#!/bin/sh +# +sudo apt-get install libzmq3-dev -y +sudo apt-get install $LUA -y +sudo apt-get install $LIBLUA -y +LUA_LIBDIR=`pkg-config $LUA --variable=libdir` +INSTALL_LMOD=`pkg-config $LUA --variable=INSTALL_LMOD` +INSTALL_CMOD=`pkg-config $LUA --variable=INSTALL_CMOD` +## make sure there is a 'lua' command. +if [ ! -x /usr/bin/lua ]; then + sudo ln -s `which $LUA` /usr/bin/lua; +fi +## install lua-llthreads +git clone git://github.com/Neopallium/lua-llthreads.git +cd lua-llthreads ; mkdir build ; cd build +cmake .. -DLUA_LIBRARIES=$LUA_LIBDIR -DLUA_INCLUDE_DIR=$LUA_INCDIR + -DINSTALL_LMOD=$INSTALL_LMOD -DINSTALL_CMOD=$INSTALL_CMOD +make +sudo make install +cd ../.. + +