aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Melnichuk <mimir@newmail.ru>2014-11-26 13:15:31 +0400
committerAlexey Melnichuk <mimir@newmail.ru>2014-11-26 13:15:31 +0400
commit873a2ee84d353d71e2900a2686b70720f8d88abe (patch)
treea1ca6e789defd31657b1b438a770b95f40cf0839
parentc0c857924c695e1aacb601a809ee48bbbe903cc8 (diff)
downloadlua-llthreads2-873a2ee84d353d71e2900a2686b70720f8d88abe.tar.gz
lua-llthreads2-873a2ee84d353d71e2900a2686b70720f8d88abe.tar.bz2
lua-llthreads2-873a2ee84d353d71e2900a2686b70720f8d88abe.zip
Run test with Lua 5.3 on Travis
-rw-r--r--.travis.yml34
-rw-r--r--.travis/setup_lua.sh14
2 files changed, 29 insertions, 19 deletions
diff --git a/.travis.yml b/.travis.yml
index 2fce595..4e65b9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,10 +2,11 @@ language: c
2 2
3env: 3env:
4 global: 4 global:
5 - LUAROCKS=2.2.0beta1 5 - LUAROCKS=2.2.0
6 matrix: 6 matrix:
7 - LUA=lua5.1 7 - LUA=lua5.1
8 - LUA=lua5.2 8 - LUA=lua5.2
9 - LUA=lua5.3
9 - LUA=luajit 10 - LUA=luajit
10 11
11branches: 12branches:
@@ -16,28 +17,27 @@ before_install:
16 - bash .travis/setup_lua.sh 17 - bash .travis/setup_lua.sh
17 18
18install: 19install:
19 - sudo luarocks install lunitx
20 - sudo luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec 20 - sudo luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec
21 - sudo luarocks make rockspecs/lua-llthreads2-scm-0.rockspec 21 - sudo luarocks make rockspecs/lua-llthreads2-scm-0.rockspec
22 22
23script: 23script:
24 - cd test 24 - cd test
25 - lua$LUA_SFX test_table_copy.lua 25 - lua test_table_copy.lua
26 - lua$LUA_SFX test_threads.lua 10 26 - lua test_threads.lua 10
27 - lua$LUA_SFX test_llthreads.lua 27 - lua test_llthreads.lua
28 - lua test_join_timeout.lua
29 - lua test_join_detach.lua
30 - lua test_join_error.lua
31 - lua test_register_ffi.lua
32 - lua test_logger.lua
33 - lua test_pass_cfunction.lua
34 - lua test_load_llthreads2.lua
35 - lua test_alive.lua
36 - lua test_threads_ex.lua 10
37 - lua test_threads_ex_arg.lua
38 - lua test_threads_ex_opt.lua
39 - lua test_threads_attr.lua
28 # - lua$LUA_SFX test_register_llthreads.lua 40 # - lua$LUA_SFX test_register_llthreads.lua
29 - lua$LUA_SFX test_join_timeout.lua
30 - lua$LUA_SFX test_join_detach.lua
31 - lua$LUA_SFX test_join_error.lua
32 - lua$LUA_SFX test_register_ffi.lua
33 - lua$LUA_SFX test_logger.lua
34 - lua$LUA_SFX test_pass_cfunction.lua
35 - lua$LUA_SFX test_load_llthreads2.lua
36 - lua$LUA_SFX test_alive.lua
37 - lua$LUA_SFX test_threads_ex.lua 10
38 - lua$LUA_SFX test_threads_ex_arg.lua
39 - lua$LUA_SFX test_threads_ex_opt.lua
40 - lua$LUA_SFX test_threads_attr.lua
41 41
42notifications: 42notifications:
43 email: 43 email:
diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh
index 9841cb5..373e24d 100644
--- a/.travis/setup_lua.sh
+++ b/.travis/setup_lua.sh
@@ -56,6 +56,9 @@ else
56 elif [ "$LUA" == "lua5.2" ]; then 56 elif [ "$LUA" == "lua5.2" ]; then
57 curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz 57 curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
58 cd lua-5.2.3; 58 cd lua-5.2.3;
59 elif [ "$LUA" == "lua5.3" ]; then
60 curl http://www.lua.org/work/lua-5.3.0-beta.tar.gz | tar xz
61 cd lua-5.3.0-beta;
59 fi 62 fi
60 sudo make $PLATFORM install; 63 sudo make $PLATFORM install;
61fi 64fi
@@ -63,8 +66,13 @@ fi
63cd $TRAVIS_BUILD_DIR; 66cd $TRAVIS_BUILD_DIR;
64 67
65LUAROCKS_BASE=luarocks-$LUAROCKS 68LUAROCKS_BASE=luarocks-$LUAROCKS
66curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz 69
67cd $LUAROCKS_BASE; 70# curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
71
72git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_BASE
73cd $LUAROCKS_BASE
74
75git checkout v$LUAROCKS
68 76
69if [ "$LUA" == "luajit" ]; then 77if [ "$LUA" == "luajit" ]; then
70 ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0; 78 ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
@@ -88,4 +96,6 @@ elif [ "$LUA" == "lua5.1" ]; then
88 rm -rf lua-5.1.5; 96 rm -rf lua-5.1.5;
89elif [ "$LUA" == "lua5.2" ]; then 97elif [ "$LUA" == "lua5.2" ]; then
90 rm -rf lua-5.2.3; 98 rm -rf lua-5.2.3;
99elif [ "$LUA" == "lua5.3" ]; then
100 rm -rf lua-5.3.0-beta;
91fi 101fi