Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/torch/image.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSoumith Chintala <soumith@gmail.com>2015-11-15 01:06:36 +0300
committerSoumith Chintala <soumith@gmail.com>2015-11-15 01:06:36 +0300
commit5fb279988b5648939bb8f5f0c69842b4aa9262c9 (patch)
tree0a9ebdf2188a541d1d19aba570a1be4d62ead480
parent82a1c0a4cc5ccb653885d67cc192441f16525ee3 (diff)
Update .travis.yml
-rw-r--r--.travis.yml14
1 files changed, 10 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index debe30a..060ae0a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,6 +6,10 @@ cache:
directories:
- $HOME/OpenBlasInstall
sudo: false
+env:
+ - TORCH_LUA_VERSION=LUAJIT21
+ - TORCH_LUA_VERSION=LUA51
+ - TORCH_LUA_VERSION=LUA52
addons:
apt:
packages:
@@ -43,14 +47,16 @@ before_script:
- cd ~/torch && git submodule update --init --recursive
- mkdir build && cd build
- export CMAKE_LIBRARY_PATH=$HOME/OpenBlasInstall/include:$HOME/OpenBlasInstall/lib:$CMAKE_LIBRARY_PATH
-- cmake .. -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" -DCMAKE_BUILD_TYPE=Release -DWITH_LUAJIT21=ON
+- cmake .. -DCMAKE_INSTALL_PREFIX="${INSTALL_PREFIX}" -DCMAKE_BUILD_TYPE=Release -DWITH_${TORCH_LUA_VERSION}=ON
- make && make install
- cd $ROOT_TRAVIS_DIR
- export LD_LIBRARY_PATH=${INSTALL_PREFIX}/lib:$LD_LIBRARY_PATH
script:
- ${INSTALL_PREFIX}/bin/luarocks make
-- ${INSTALL_PREFIX}/bin/luajit -limage -e "print('image loaded succesfully')"
+- export PATH=${INSTALL_PREFIX}/bin:$PATH
+- export TESTLUA=$(which luajit lua | head -n 1)
+- ${TESTLUA} -limage -e "print('image loaded succesfully')"
- cd test
- ${INSTALL_PREFIX}/bin/luarocks install graphicsmagick
-- ${INSTALL_PREFIX}/bin/luajit ./test_rotate.lua
-- ${INSTALL_PREFIX}/bin/luajit -limage -e "t=image.test(); if t.errors[1] then os.exit(1) end"
+- ${TESTLUA} ./test_rotate.lua
+- ${TESTLUA} -limage -e "t=image.test(); if t.errors[1] then os.exit(1) end"