aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexey Melnichuk <mimir@newmail.ru>2014-02-11 17:59:37 +0400
committerAlexey Melnichuk <mimir@newmail.ru>2014-02-11 17:59:37 +0400
commit8967ec28bc16cc918b0e7e1c05d629c126dd75d6 (patch)
treed670206c200f329a4a89bc869ea30dc0d17e30d5
parentd13929706a3b45bd64e0a87e0afc3d45625e888d (diff)
downloadlua-llthreads2-dist-llthreads2.tar.gz
lua-llthreads2-dist-llthreads2.tar.bz2
lua-llthreads2-dist-llthreads2.zip
Fix. Do not run test for llthreads2-compat module.dist-llthreads2
-rw-r--r--.travis.yml10
-rw-r--r--CMakeLists.txt2
2 files changed, 2 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml
index 3bb3efa..8175c5f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,17 +35,7 @@ script:
35 - ~/luadist _test install lua-5.1.5 -binary=false -verbose -DCMAKE_TOOLCHAIN_FILE=$TOOLFILE 35 - ~/luadist _test install lua-5.1.5 -binary=false -verbose -DCMAKE_TOOLCHAIN_FILE=$TOOLFILE
36 - ~/luadist _test make . -binary=false -verbose -DCMAKE_TOOLCHAIN_FILE=$TOOLFILE 36 - ~/luadist _test make . -binary=false -verbose -DCMAKE_TOOLCHAIN_FILE=$TOOLFILE
37 - cd _test/share/lua-llthreads2/test 37 - cd _test/share/lua-llthreads2/test
38 - $TRAVIS_BUILD_DIR/_test/bin/lua test_table_copy.lua
39 - $TRAVIS_BUILD_DIR/_test/bin/lua test_threads.lua
40 - $TRAVIS_BUILD_DIR/_test/bin/lua test_llthreads.lua
41 - $TRAVIS_BUILD_DIR/_test/bin/lua test_join_timeout.lua
42 - $TRAVIS_BUILD_DIR/_test/bin/lua test_join_detach.lua
43 - $TRAVIS_BUILD_DIR/_test/bin/lua test_join_error.lua
44 - $TRAVIS_BUILD_DIR/_test/bin/lua test_register_ffi.lua
45 - $TRAVIS_BUILD_DIR/_test/bin/lua test_logger.lua
46 - $TRAVIS_BUILD_DIR/_test/bin/lua test_pass_cfunction.lua
47 - $TRAVIS_BUILD_DIR/_test/bin/lua test_load_llthreads2.lua 38 - $TRAVIS_BUILD_DIR/_test/bin/lua test_load_llthreads2.lua
48 - $TRAVIS_BUILD_DIR/_test/bin/lua test_alive.lua
49 39
50 40
51# Execute additional tests or commands 41# Execute additional tests or commands
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 596e496..1e3991c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,5 +13,7 @@ set ( LUA_LLTHREADS_SRC llthreads2/src/l52util.c llthreads2/src/llthread.c )
13 13
14install_lua_module ( llthreads2 ${LUA_LLTHREADS_SRC} LINK ${CMAKE_THREAD_LIBS_INIT} ) 14install_lua_module ( llthreads2 ${LUA_LLTHREADS_SRC} LINK ${CMAKE_THREAD_LIBS_INIT} )
15 15
16set_target_properties ( llthreads2 PROPERTIES COMPILE_DEFINITIONS "LLTHREAD_MODULE_NAME=llthreads2" )
17
16install_data ( llthreads2/COPYRIGHT.llthreads llthreads2/README.md llthreads2/LICENSE ) 18install_data ( llthreads2/COPYRIGHT.llthreads llthreads2/README.md llthreads2/LICENSE )
17install_test ( llthreads2/test/ ) 19install_test ( llthreads2/test/ )