Merge pull request #8 from rrthomas/master

New lfs.link and other goodies

1 files changed, 17 insertions, 18 deletions

diff --git a/tests/test.lua b/tests/test.lua
index 7111074..c4911c9 100644
--- a/tests/test.lua
+++ b/tests/test.lua
@@ -1,7 +1,7 @@
-#!/usr/local/bin/lua5.1
+#!/usr/bin/env lua5.1
 
 local tmp = "/tmp"
-local sep = "/"
+local sep = string.match (package.config, "[^\n]+")
 local upper = ".."
 
 require"lfs"
@@ -69,24 +69,23 @@ local new_att = assert (lfs.attributes (tmpfile))
 assert (new_att.access == testdate2, "could not set access time")
 assert (new_att.modification == testdate1, "could not set modification time")
 
-local res, err = lfs.symlinkattributes(tmpfile)
-if err ~= "symlinkattributes not supported on this platform" then
-    -- Checking symbolic link information (does not work in Windows)
-    assert (os.execute ("ln -s "..tmpfile.." _a_link_for_test_"))
-    assert (lfs.attributes"_a_link_for_test_".mode == "file")
-    assert (lfs.symlinkattributes"_a_link_for_test_".mode == "link")
-    assert (os.remove"_a_link_for_test_")
+-- Checking link (does not work on Windows)
+if lfs.link (tmpfile, "_a_link_for_test_", true) then
+  assert (lfs.attributes"_a_link_for_test_".mode == "file")
+  assert (lfs.symlinkattributes"_a_link_for_test_".mode == "link")
+  assert (lfs.link (tmpfile, "_a_hard_link_for_test_"))
+  assert (lfs.attributes (tmpfile, "nlink") == 2)
+  assert (os.remove"_a_link_for_test_")
+  assert (os.remove"_a_hard_link_for_test_")
 end
 
-if lfs.setmode then
-    -- Checking text/binary modes (works only in Windows)
-    local f = io.open(tmpfile, "w")
-    local result, mode = lfs.setmode(f, "binary")
-    assert((result and mode == "text") or (not result and mode == "setmode not supported on this platform"))
-    result, mode = lfs.setmode(f, "text")
-    assert((result and mode == "binary") or (not result and mode == "setmode not supported on this platform"))
-    f:close()
-end
+-- Checking text/binary modes (only has an effect in Windows)
+local f = io.open(tmpfile, "w")
+local result, mode = lfs.setmode(f, "binary")
+assert(result) -- on non-Windows platforms, mode is always returned as "binary"
+result, mode = lfs.setmode(f, "text")
+assert(result and mode == "binary")
+f:close()
     
 -- Restore access time to current value
 assert (lfs.touch (tmpfile, attrib.access, attrib.modification))