Run test with Lua 5.3 on Travis

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
 
 env:
   global:
-    - LUAROCKS=2.2.0beta1
+    - LUAROCKS=2.2.0
   matrix:
     - LUA=lua5.1
     - LUA=lua5.2
+    - LUA=lua5.3
     - LUA=luajit
 
 branches:
@@ -16,28 +17,27 @@ before_install:
   - bash .travis/setup_lua.sh
 
 install:
-  - sudo luarocks install lunitx
   - sudo luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec
   - sudo luarocks make rockspecs/lua-llthreads2-scm-0.rockspec
 
 script: 
   - cd test
-  - lua$LUA_SFX test_table_copy.lua
-  - lua$LUA_SFX test_threads.lua 10
-  - lua$LUA_SFX test_llthreads.lua
+  - lua test_table_copy.lua
+  - lua test_threads.lua 10
+  - lua test_llthreads.lua
+  - lua test_join_timeout.lua
+  - lua test_join_detach.lua
+  - lua test_join_error.lua
+  - lua test_register_ffi.lua
+  - lua test_logger.lua
+  - lua test_pass_cfunction.lua
+  - lua test_load_llthreads2.lua
+  - lua test_alive.lua
+  - lua test_threads_ex.lua 10
+  - lua test_threads_ex_arg.lua
+  - lua test_threads_ex_opt.lua
+  - lua test_threads_attr.lua
   # - lua$LUA_SFX test_register_llthreads.lua
-  - lua$LUA_SFX test_join_timeout.lua
-  - lua$LUA_SFX test_join_detach.lua
-  - lua$LUA_SFX test_join_error.lua
-  - lua$LUA_SFX test_register_ffi.lua
-  - lua$LUA_SFX test_logger.lua
-  - lua$LUA_SFX test_pass_cfunction.lua
-  - lua$LUA_SFX test_load_llthreads2.lua
-  - lua$LUA_SFX test_alive.lua
-  - lua$LUA_SFX test_threads_ex.lua 10
-  - lua$LUA_SFX test_threads_ex_arg.lua
-  - lua$LUA_SFX test_threads_ex_opt.lua
-  - lua$LUA_SFX test_threads_attr.lua
 
 notifications:
   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
   elif [ "$LUA" == "lua5.2" ]; then
     curl http://www.lua.org/ftp/lua-5.2.3.tar.gz | tar xz
     cd lua-5.2.3;
+  elif [ "$LUA" == "lua5.3" ]; then
+    curl http://www.lua.org/work/lua-5.3.0-beta.tar.gz | tar xz
+    cd lua-5.3.0-beta;
   fi
   sudo make $PLATFORM install;
 fi
@@ -63,8 +66,13 @@ fi
 cd $TRAVIS_BUILD_DIR;
 
 LUAROCKS_BASE=luarocks-$LUAROCKS
-curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
-cd $LUAROCKS_BASE;
+
+# curl http://luarocks.org/releases/$LUAROCKS_BASE.tar.gz | tar xz
+
+git clone https://github.com/keplerproject/luarocks.git $LUAROCKS_BASE
+cd $LUAROCKS_BASE
+
+git checkout v$LUAROCKS
 
 if [ "$LUA" == "luajit" ]; then
   ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
@@ -88,4 +96,6 @@ elif [ "$LUA" == "lua5.1" ]; then
   rm -rf lua-5.1.5;
 elif [ "$LUA" == "lua5.2" ]; then
   rm -rf lua-5.2.3;
+elif [ "$LUA" == "lua5.3" ]; then
+  rm -rf lua-5.3.0-beta;
 fi