diff options
author | Alexey Melnichuk <mimir@newmail.ru> | 2014-02-04 09:56:38 +0400 |
---|---|---|
committer | Alexey Melnichuk <mimir@newmail.ru> | 2014-02-04 09:56:38 +0400 |
commit | d35bf824e0dd9c3584d1587b5ec662a0fcf71bfe (patch) | |
tree | 8a52611e53cf10c82312558e6b66bf8639e723b5 | |
parent | aa247887dcf9ad0375723ce91c39243df2baf547 (diff) | |
download | lua-llthreads2-d35bf824e0dd9c3584d1587b5ec662a0fcf71bfe.tar.gz lua-llthreads2-d35bf824e0dd9c3584d1587b5ec662a0fcf71bfe.tar.bz2 lua-llthreads2-d35bf824e0dd9c3584d1587b5ec662a0fcf71bfe.zip |
Add. Test to double join to same thread
-rw-r--r-- | .travis.yml | 1 | ||||
-rw-r--r-- | lakefile | 1 | ||||
-rw-r--r-- | test/test_join_error.lua | 24 |
3 files changed, 26 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 38b2ca6..b6dc082 100644 --- a/.travis.yml +++ b/.travis.yml | |||
@@ -51,6 +51,7 @@ script: | |||
51 | # - lua$LUA_SFX test_register_llthreads.lua | 51 | # - lua$LUA_SFX test_register_llthreads.lua |
52 | - lua$LUA_SFX test_join_timeout.lua | 52 | - lua$LUA_SFX test_join_timeout.lua |
53 | - lua$LUA_SFX test_join_detach.lua | 53 | - lua$LUA_SFX test_join_detach.lua |
54 | - lua$LUA_SFX test_join_error.lua | ||
54 | - lua$LUA_SFX test_register_ffi.lua | 55 | - lua$LUA_SFX test_register_ffi.lua |
55 | - lua$LUA_SFX test_logger.lua | 56 | - lua$LUA_SFX test_logger.lua |
56 | - lua$LUA_SFX test_pass_cfunction.lua | 57 | - lua$LUA_SFX test_pass_cfunction.lua |
@@ -32,6 +32,7 @@ target('test', install, function() | |||
32 | run_test('test_threads.lua') | 32 | run_test('test_threads.lua') |
33 | run_test('test_join_timeout.lua') | 33 | run_test('test_join_timeout.lua') |
34 | run_test('test_join_detach.lua') | 34 | run_test('test_join_detach.lua') |
35 | run_test('test_join_error.lua') | ||
35 | run_test('test_register_ffi.lua') | 36 | run_test('test_register_ffi.lua') |
36 | run_test('test_logger.lua') | 37 | run_test('test_logger.lua') |
37 | run_test('test_pass_cfunction.lua') | 38 | run_test('test_pass_cfunction.lua') |
diff --git a/test/test_join_error.lua b/test/test_join_error.lua new file mode 100644 index 0000000..90780b1 --- /dev/null +++ b/test/test_join_error.lua | |||
@@ -0,0 +1,24 @@ | |||
1 | local llthreads = require "llthreads" | ||
2 | local utils = require "utils" | ||
3 | local sleep = utils.sleep | ||
4 | |||
5 | local include = utils.thread_init .. [[ | ||
6 | local llthreads = require"llthreads" | ||
7 | local sleep = require "utils".sleep | ||
8 | ]] | ||
9 | |||
10 | local thread = llthreads.new(include .. [[ | ||
11 | sleep(5) | ||
12 | ]]) | ||
13 | |||
14 | thread:start() | ||
15 | |||
16 | local ok, err = thread:join() | ||
17 | assert(ok == true) | ||
18 | assert(err == nil) | ||
19 | |||
20 | local res, ok, err = pcall(thread.join, thread) | ||
21 | assert(res == true) | ||
22 | assert(ok == nil) | ||
23 | assert(err ~= nil) | ||
24 | |||