Merge branch 'master' into hjelmeland-patch-1hjelmeland-patch-1

1 files changed, 22 insertions, 6 deletions

diff --git a/test/tcp-getoptions b/test/tcp-getoptions
index f9b3d1b..fbcc884 100755
--- a/test/tcp-getoptions
+++ b/test/tcp-getoptions
@@ -1,19 +1,35 @@
 #!/usr/bin/env lua
 
-require"socket"
+local socket = require"socket"
 
 port = 8765
 
+function pcalltest(msg, o, opt)
+  local a = { pcall(o.getoption, o, opt) }
+  if a[1] then
+    print(msg, opt, unpack(a))
+  else
+    print(msg, opt, 'fail: ' .. a[2])
+  end
+end
+
 function options(o)
     print("options for", o)
 
-    for _, opt in ipairs{"keepalive", "reuseaddr", "tcp-nodelay"} do
-        print("getoption", opt, o:getoption(opt))
+    for _, opt in ipairs{
+                "keepalive", "reuseaddr",
+                "tcp-nodelay", "tcp-keepidle", "tcp-keepcnt", "tcp-keepintvl"} do
+        pcalltest("getoption", o, opt)
     end
 
-    print("getoption", "linger",
-        "on", o:getoption("linger").on,
-        "timeout", o:getoption("linger").timeout)
+    r = o:getoption'linger'
+    if r then
+      print("getoption", "linger",
+            "on", r.on,
+            "timeout", r.timeout)
+    else
+      print("getoption", "linger", "no result")
+    end
 end
 
 local m = socket.tcp()