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:
   # - lua$LUA_SFX test_register_llthreads.lua
   - lua$LUA_SFX test_join_timeout.lua
   - lua$LUA_SFX test_join_detach.lua
+  - lua$LUA_SFX test_join_error.lua
   - lua$LUA_SFX test_register_ffi.lua
   - lua$LUA_SFX test_logger.lua
   - lua$LUA_SFX test_pass_cfunction.lua
diff --git a/lakefile b/lakefile
index 95e5d8e..b7786b1 100644
--- a/lakefile
+++ b/lakefile
@@ -32,6 +32,7 @@ target('test', install, function()
   run_test('test_threads.lua')

   run_test('test_join_timeout.lua')

   run_test('test_join_detach.lua')

+  run_test('test_join_error.lua')

   run_test('test_register_ffi.lua')

   run_test('test_logger.lua')

   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 @@
+local llthreads = require "llthreads"
+local utils     = require "utils"
+local sleep     = utils.sleep
+
+local include = utils.thread_init .. [[
+local llthreads = require"llthreads"
+local sleep = require "utils".sleep
+]]
+
+local thread = llthreads.new(include .. [[
+  sleep(5)
+]])
+
+thread:start()
+
+local ok, err = thread:join()
+assert(ok  == true)
+assert(err == nil)
+
+local res, ok, err = pcall(thread.join, thread)
+assert(res == true)
+assert(ok  == nil)
+assert(err ~= nil)
+