aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormoteus <mimir@newmail.ru>2013-12-30 12:58:48 +0400
committermoteus <mimir@newmail.ru>2013-12-30 12:58:48 +0400
commit18464f368d90b0f8ce48cb5d45def6f9d87e3432 (patch)
tree89d9c45aa5a25fe361b6ec4bd5495375664b0b81 /test
parenta087c2737441aad781be7e3d88775e688152ad4e (diff)
downloadlua-llthreads2-18464f368d90b0f8ce48cb5d45def6f9d87e3432.tar.gz
lua-llthreads2-18464f368d90b0f8ce48cb5d45def6f9d87e3432.tar.bz2
lua-llthreads2-18464f368d90b0f8ce48cb5d45def6f9d87e3432.zip
Change. does not register llthread loader.
This is because of better load dynamic library from child thread to prevent unload dynamic library if parent Lua state closes.
Diffstat (limited to 'test')
-rw-r--r--test/test_join_timeout.lua7
-rw-r--r--test/test_logger.lua4
-rw-r--r--test/test_register_llthreads.lua3
3 files changed, 10 insertions, 4 deletions
diff --git a/test/test_join_timeout.lua b/test/test_join_timeout.lua
index aa8f88d..b9cf155 100644
--- a/test/test_join_timeout.lua
+++ b/test/test_join_timeout.lua
@@ -2,9 +2,8 @@ local llthreads = require"llthreads"
2local utils = require "utils" 2local utils = require "utils"
3local sleep = utils.sleep 3local sleep = utils.sleep
4 4
5local include = [[ 5local include = utils.thread_init .. [[
6local llthreads = require"llthreads" 6local llthreads = require"llthreads"
7]] .. utils.thread_init .. [[
8local sleep = require "utils".sleep 7local sleep = require "utils".sleep
9]] 8]]
10 9
@@ -17,6 +16,8 @@ print("thread:join(0): ", ok, err)
17assert(ok == nil) 16assert(ok == nil)
18assert(err == "timeout") 17assert(err == "timeout")
19 18
20print("thread:join(): ", thread:join()) 19local ok, err = thread:join()
20print("thread:join(): ", ok, err)
21assert(ok, err)
21print("Done!") 22print("Done!")
22 23
diff --git a/test/test_logger.lua b/test/test_logger.lua
index 66c190f..f85a896 100644
--- a/test/test_logger.lua
+++ b/test/test_logger.lua
@@ -1,4 +1,6 @@
1require "llthreads".new([[ 1local utils = require "utils"
2
3require "llthreads".new(utils.thread_init .. [[
2require "string" 4require "string"
3 5
4require "llthreads".set_logger(function(msg) 6require "llthreads".set_logger(function(msg)
diff --git a/test/test_register_llthreads.lua b/test/test_register_llthreads.lua
index f02bf86..5b234a9 100644
--- a/test/test_register_llthreads.lua
+++ b/test/test_register_llthreads.lua
@@ -1,3 +1,6 @@
1-- Test if you build module with
2-- LLTHREAD_REGISTER_THREAD_LIBRARY
3
1local llthreads = require "llthreads" 4local llthreads = require "llthreads"
2local thread = llthreads.new([[ 5local thread = llthreads.new([[
3 if not package.preload.llthreads then 6 if not package.preload.llthreads then