fix CI: use hererocks for Lua5.3 on Linux (#89)
This commit is contained in:
parent
7049ac4f8c
commit
196162bec1
10
.travis.yml
10
.travis.yml
@ -42,15 +42,13 @@ matrix:
|
|||||||
packages:
|
packages:
|
||||||
- g++-5
|
- g++-5
|
||||||
before_install:
|
before_install:
|
||||||
- sudo add-apt-repository -y "deb http://ppa.launchpad.net/grilo-team/travis/ubuntu trusty main"
|
- pip install hererocks --user
|
||||||
- sudo add-apt-repository -y "deb http://ppa.launchpad.net/fkrull/deadsnakes/ubuntu trusty main"
|
- hererocks lua53 -l5.3 -rlatest
|
||||||
- sudo apt-get update -qq
|
- source lua53/bin/activate
|
||||||
install:
|
install:
|
||||||
- sudo apt-get install -qq --force-yes lua5.3 liblua5.3-dev
|
|
||||||
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
|
- sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-5 1
|
||||||
- sudo update-alternatives --install /usr/bin/lua lua /usr/bin/lua5.3 1
|
|
||||||
script:
|
script:
|
||||||
- ci/test_all.sh -DLUA_INCLUDE_DIR="/usr/include/lua5.3" -DLUA_LIBRARY="/usr/lib/x86_64-linux-gnu/liblua5.3.so"
|
- ci/test_all.sh -DLUA_INCLUDE_DIR="$PWD/lua53/include"
|
||||||
- os: linux
|
- os: linux
|
||||||
env: LUA=LuaJIT
|
env: LUA=LuaJIT
|
||||||
addons:
|
addons:
|
||||||
|
|||||||
@ -9,7 +9,7 @@ if(NOT CMAKE_BUILD_TYPE)
|
|||||||
set(CMAKE_BUILD_TYPE "Release")
|
set(CMAKE_BUILD_TYPE "Release")
|
||||||
endif(NOT CMAKE_BUILD_TYPE)
|
endif(NOT CMAKE_BUILD_TYPE)
|
||||||
|
|
||||||
if (NOT (LUA_INCLUDE_DIR AND LUA_LIBRARY OR BUILD_ROCK))
|
if (NOT (LUA_INCLUDE_DIR OR BUILD_ROCK))
|
||||||
find_package(Lua REQUIRED)
|
find_package(Lua REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
@ -5,7 +5,7 @@ test.channel_stress.tear_down = default_tear_down
|
|||||||
test.channel_stress.with_multiple_threads = function ()
|
test.channel_stress.with_multiple_threads = function ()
|
||||||
local exchange_channel, result_channel = effil.channel(), effil.channel()
|
local exchange_channel, result_channel = effil.channel(), effil.channel()
|
||||||
|
|
||||||
local threads_number = 1000
|
local threads_number = 20
|
||||||
local threads = {}
|
local threads = {}
|
||||||
for i = 1, threads_number do
|
for i = 1, threads_number do
|
||||||
threads[i] = effil.thread(function(exchange_channel, result_channel, indx)
|
threads[i] = effil.thread(function(exchange_channel, result_channel, indx)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user