Update Travis files.

3 files changed, 25 insertions, 128 deletions

diff --git a/.travis.yml b/.travis.yml
index 779b236..335473d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,24 +1,36 @@
-language: c
+sudo: false
 
-env:
-  global:
-    - LUAROCKS=2.2.0
-  matrix:
-    - LUA=lua5.1
-    - LUA=lua5.2
-    - LUA=lua5.3
-    - LUA=luajit
+matrix:
+  include:
+    - compiler: ": Lua51"
+      env: LUA="lua 5.1"
+    - compiler: ": Lua52"
+      env: LUA="lua 5.2"
+    - compiler: ": Lua53"
+      env: LUA="lua 5.3"
+    - compiler: ": LuaJIT20"
+      env: LUA="luajit 2.0"
+    - compiler: ": LuaJIT21"
+      env: LUA="luajit 2.1"
+
+cache:
+  directories:
+    - here
+    - $HOME/.cache/pip
 
 branches:
   only:
     - master
 
 before_install:
-  - bash .travis/setup_lua.sh
+  - export CC=gcc
+  - pip install --user hererocks
+  - hererocks here -r^ --$LUA;
+  - export PATH=$PATH:$PWD/here/bin
 
 install:
-  - sudo luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec
-  - sudo luarocks make rockspecs/lua-llthreads2-scm-0.rockspec
+  - luarocks make rockspecs/lua-llthreads2-compat-scm-0.rockspec
+  - luarocks make rockspecs/lua-llthreads2-scm-0.rockspec
 
 script: 
   - cd test
@@ -39,6 +51,7 @@ script:
   - lua test_threads_ex_opt.lua
   - lua test_threads_ex_opt_2.lua
   - lua test_threads_attr.lua
+  - lua test_integer.lua
   # - lua$LUA_SFX test_register_llthreads.lua
 
 notifications:
diff --git a/.travis/platform.sh b/.travis/platform.sh
deleted file mode 100644
index 4a3af0d..0000000
--- a/.travis/platform.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-if [ -z "$PLATFORM" ]; then
-  PLATFORM=$TRAVIS_OS_NAME;
-fi
-
-if [ "$PLATFORM" == "osx" ]; then
-  PLATFORM="macosx";
-fi
-
-if [ -z "$PLATFORM" ]; then
-  if [ "$(uname)" == "Linux" ]; then
-    PLATFORM="linux";
-  else
-    PLATFORM="macosx";
-  fi;
-fi
diff --git a/.travis/setup_lua.sh b/.travis/setup_lua.sh
deleted file mode 100644
index e37d6cf..0000000
--- a/.travis/setup_lua.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#! /bin/bash
-
-# A script for setting up environment for travis-ci testing.
-# Sets up Lua and Luarocks.
-# LUA must be "lua5.1", "lua5.2" or "luajit".
-# luajit2.0 - master v2.0
-# luajit2.1 - master v2.1
-
-LUAJIT_BASE="LuaJIT-2.0.3"
-
-source .travis/platform.sh
-
-LUAJIT="no"
-
-if [ "$PLATFORM" == "macosx" ]; then
-  if [ "$LUA" == "luajit" ]; then
-    LUAJIT="yes";
-  fi
-  if [ "$LUA" == "luajit2.0" ]; then
-    LUAJIT="yes";
-  fi
-  if [ "$LUA" == "luajit2.1" ]; then
-    LUAJIT="yes";
-  fi;
-elif [ "$(expr substr $LUA 1 6)" == "luajit" ]; then
-  LUAJIT="yes";
-fi
-
-if [ "$LUAJIT" == "yes" ]; then
-
-  if [ "$LUA" == "luajit" ]; then
-    curl http://luajit.org/download/$LUAJIT_BASE.tar.gz | tar xz;
-  else
-    git clone http://luajit.org/git/luajit-2.0.git $LUAJIT_BASE;
-  fi
-
-  cd $LUAJIT_BASE
-
-  if [ "$LUA" == "luajit2.1" ]; then
-    git checkout v2.1;
-  fi
-
-  make && sudo make install
-
-  if [ "$LUA" == "luajit2.1" ]; then
-    sudo ln -s /usr/local/bin/luajit-2.1.0-alpha /usr/local/bin/luajit
-    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
-  else
-    sudo ln -s /usr/local/bin/luajit /usr/local/bin/lua;
-  fi;
-
-else
-  if [ "$LUA" == "lua5.1" ]; then
-    curl http://www.lua.org/ftp/lua-5.1.5.tar.gz | tar xz
-    cd lua-5.1.5;
-  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/ftp/lua-5.3.0.tar.gz | tar xz
-    cd lua-5.3.0;
-  fi
-  sudo make $PLATFORM install;
-fi
-
-cd $TRAVIS_BUILD_DIR;
-
-LUAROCKS_BASE=luarocks-$LUAROCKS
-
-# 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;
-elif [ "$LUA" == "luajit2.0" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.0;
-elif [ "$LUA" == "luajit2.1" ]; then
-  ./configure --lua-suffix=jit --with-lua-include=/usr/local/include/luajit-2.1;
-else
-  ./configure;
-fi
-
-make build && sudo make install
-
-cd $TRAVIS_BUILD_DIR
-
-rm -rf $LUAROCKS_BASE
-
-if [ "$LUAJIT" == "yes" ]; then
-  rm -rf $LUAJIT_BASE;
-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;
-fi