Use new $(lua.c.lib.dir) make variable provided by make-common, and m…

…ove the tests under the test directory. Also added more IO tests that depend on luasocket. These test exemplify the need for using coroutine yields to wrap read/write operations.

README

@@ -18,7 +18,7 @@ EVLUA:
     timeout to be created, and your thread continues after the timeout
     event occurs.  To the person writing the code, this appears as
     though we "slept", but other threads still got the opportunity to
-    run.
+    run. (VAPOR-WARE)
 
 IMPLEMENTATION NOTES:
 

ev.luadoc

@@ -1,7 +1,7 @@
 #!lua
 
---- EvLua exposes libev functionality to lua.
-module "evlua"
+--- Lua Ev exposes libev functionality to lua.
+module "ev"
 
 --- The version of libev in use as a floating point.
 -- @return floating point version number.

module.mk

@@ -4,7 +4,7 @@ include $(make-common.dir)/tool/cc.mk
 include $(make-common.dir)/tool/lua.mk
 include $(make-common.dir)/layout.mk
 
-_lib  := $(lua.lib.dir)/ev.so
+_lib  := $(lua.c.lib.dir)/ev.so
 _objs := $(call cc.c.to.o,$(addprefix $(_pwd)/, \
     lua_ev.c \
     lua_ev_io.c \
@@ -24,9 +24,9 @@ $(_lib): $(_objs)
 test: | lua_ev.test
 
 lua ?= lua
-lua_ev.test: | $(lua.lib.dir)/ev.so
-lua_ev.test: lua.path += $(_pwd)
-lua_ev.test: $(wildcard $(_pwd)/test*)
+lua_ev.test: | $(lua.c.lib.dir)/ev.so
+lua_ev.test: lua.path += $(_pwd)/test
+lua_ev.test: $(wildcard $(_pwd)/test/test_*.lua)
 	@mkdir -p $(tmp.dir)
 	cd $(tmp.dir); for t in $(filter-out %_help.lua,$^); do \
 		echo "TESTING: $$t"; \

test/test_ev_io.lua

@@ -0,0 +1,106 @@
+-- This test relies on socket support:
+local has_socket, socket = pcall(require, "socket")
+if not has_socket then
+   print '1..0'
+   print '# No socket library available'
+   os.exit(0)
+end
+print '1..??'
+
+local tap  = require("tap")
+local ev   = require("ev")
+local help = require("help")
+local ok   = tap.ok
+local dump = require("dumper").dump
+
+local noleaks = help.collect_and_assert_no_watchers
+local loop    = ev.Loop.default
+
+local function test_stdin()
+   local io1 = ev.IO.new(
+      function(loop, io, revents)
+         ok(true, 'STDIN is writable')
+         io:stop(loop)
+      end, 1, ev.WRITE)
+   io1:start(loop)
+   loop:loop()
+end
+
+local function newtry()
+   local try = {}
+   setmetatable(try, try)
+   function try:__call(body)
+      local is_err, err = pcall(body)
+      for finalizer in ipairs(self) do
+         -- ignore errors in finalizers:
+         pcall(finalizer)
+      end
+      assert(is_err, err)
+   end
+   function try:finally(finalizer)
+      self[#self + 1] = finalizer
+   end
+   return try
+end
+
+local function test_echo()
+   local got_response
+   local try = newtry()
+   try(function()
+          local server = assert(socket.bind("*", 0))
+          try:finally(function() server:close() end)
+          server:settimeout(0)
+          ev.IO.new(
+             function(loop, timer)
+                timer:stop(loop)
+                local client = assert(server:accept())
+                client:settimeout(0)
+                ev.IO.new(
+                   function(loop, timer)
+                      timer:stop(loop)
+                      local buff = assert(client:receive('*a'))
+                      ev.IO.new(
+                         function(loop, timer)
+                            timer:stop(loop)
+                            assert(client:send(buff))
+                            assert(client:shutdown("send"))
+                         end,
+                         client:getfd(),
+                         ev.WRITE):start(loop)
+                   end,
+                   client:getfd(),
+                   ev.READ):start(loop)
+             end,
+             server:getfd(),
+             ev.READ):start(loop)
+          local port   = select(2, server:getsockname())
+          local client = assert(socket.connect("127.0.0.1", port))
+          try:finally(function() client:close() end)
+          client:settimeout(0)
+          ev.IO.new(
+             function(loop, timer)
+                timer:stop(loop)
+                local str = "Hello World"
+                assert(client:send(str))
+                assert(client:shutdown("send"))
+                ev.IO.new(
+                   function(loop, timer)
+                      timer:stop(loop)
+                      local response = assert(client:receive("*a"))
+                      ok(response == str,
+                         tostring(response) .. " == " .. tostring(str))
+                      got_response = true
+                   end,
+                   client:getfd(),
+                   ev.READ):start(loop)
+             end,
+             client:getfd(),
+             ev.WRITE):start(loop)
+          loop:loop()
+       end)
+   ok(got_response, "echo")
+end
+
+noleaks(test_stdin, "test_stdin")
+noleaks(test_echo,  "test_echo")
+

test_ev_loop.lua → test/test_ev_loop.lua

@@ -1,7 +1,7 @@
 
 local tap   = require("tap")
-local ev = require("ev")
-local help  = require("test_help")
+local ev    = require("ev")
+local help  = require("help")
 local ok    = tap.ok
 
 local noleaks = help.collect_and_assert_no_watchers

test_ev_timer.lua → test/test_ev_timer.lua

@@ -2,7 +2,7 @@ print '1..17'
 
 local tap   = require("tap")
 local ev = require("ev")
-local help  = require("test_help")
+local help  = require("help")
 local dump  = require("dumper").dump
 local ok    = tap.ok