Fix makefile and test_socket_error.lua

This commit is contained in:
Diego Nehab 2013-06-12 21:45:15 +08:00
parent b34386ca5c
commit 7cad902bb7
3 changed files with 12 additions and 4 deletions

View File

@ -1,7 +1,7 @@
#--------------------------------------------------------------------------
# Distribution makefile
#--------------------------------------------------------------------------
DIST = luasocket-2.1-rc1
DIST = luasocket-3.0-rc1
TEST = \
test/README \
@ -83,6 +83,10 @@ SRC = \
MAKE = \
makefile \
luasocket.sln \
Lua51.props \
Lua52.props \
socket.vcproj.filters \
mime.vcproj.filters \
socket.vcproj \
mime.vcproj

View File

@ -14,8 +14,12 @@ assert('timeout' == err)
for i = 1, 10 do
-- select pass even if socket has error
local _, rec, err = socket.select(nil, {sock}, 1)
assert('timeout' == err)
assert(not next(rec))
local _, ss = next(rec)
if ss then
assert(ss == sock)
else
assert('timeout' == err, 'unexpected error :' .. tostring(err))
end
err = sock:getoption("error") -- i get 'connection refused' on WinXP
if err then
print("Passed! Error is '" .. err .. "'.")