Merge branch 'master' into s-dash-stdin

1 files changed, 91 insertions, 34 deletions

diff --git a/test/unit/os/fileio_spec.lua b/test/unit/os/fileio_spec.lua
index eaccdcb2a2..4d58a8934e 100644
--- a/test/unit/os/fileio_spec.lua
+++ b/test/unit/os/fileio_spec.lua
@@ -60,15 +60,15 @@ local function file_open_new(fname, flags, mode)
   return ret1[0], ret2
 end
 
-local function file_open_fd(fd, flags, mode)
+local function file_open_fd(fd, flags)
   local ret2 = ffi.new('FileDescriptor')
-  local ret1 = m.file_open_fd(ret2, fd, flags, mode)
+  local ret1 = m.file_open_fd(ret2, fd, flags)
   return ret1, ret2
 end
 
-local function file_open_fd_new(fd, flags, mode)
+local function file_open_fd_new(fd, flags)
   local ret1 = ffi.new('int[?]', 1, {0})
-  local ret2 = ffi.gc(m.file_open_fd_new(ret1, fd, flags, mode), nil)
+  local ret2 = ffi.gc(m.file_open_fd_new(ret1, fd, flags), nil)
   return ret1[0], ret2
 end
 
@@ -76,6 +76,10 @@ local function file_write(fp, buf)
   return m.file_write(fp, buf, #buf)
 end
 
+local function msgpack_file_write(fp, buf)
+  return m.msgpack_file_write(fp, buf, #buf)
+end
+
 local function file_read(fp, size)
   local buf = nil
   if size == nil then
@@ -94,6 +98,10 @@ local function file_read(fp, size)
   return ret1, ret2
 end
 
+local function file_flush(fp)
+  return m.file_flush(fp)
+end
+
 local function file_fsync(fp)
   return m.file_fsync(fp)
 end
@@ -105,18 +113,18 @@ end
 describe('file_open_fd', function()
   itp('can use file descriptor returned by os_open for reading', function()
     local fd = m.os_open(file1, m.kO_RDONLY, 0)
-    local err, fp = file_open_fd(fd, m.kFileReadOnly, 0)
+    local err, fp = file_open_fd(fd, m.kFileReadOnly)
     eq(0, err)
     eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
   itp('can use file descriptor returned by os_open for writing', function()
     eq(nil, lfs.attributes(filec))
     local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
-    local err, fp = file_open_fd(fd, m.kFileWriteOnly, 0)
+    local err, fp = file_open_fd(fd, m.kFileWriteOnly)
     eq(0, err)
     eq(4, file_write(fp, 'test'))
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(4, lfs.attributes(filec).size)
     eq('test', io.open(filec):read('*a'))
   end)
@@ -125,18 +133,18 @@ end)
 describe('file_open_fd_new', function()
   itp('can use file descriptor returned by os_open for reading', function()
     local fd = m.os_open(file1, m.kO_RDONLY, 0)
-    local err, fp = file_open_fd_new(fd, m.kFileReadOnly, 0)
+    local err, fp = file_open_fd_new(fd, m.kFileReadOnly)
     eq(0, err)
     eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
-    eq(0, m.file_free(fp))
+    eq(0, m.file_free(fp, false))
   end)
   itp('can use file descriptor returned by os_open for writing', function()
     eq(nil, lfs.attributes(filec))
     local fd = m.os_open(filec, m.kO_WRONLY + m.kO_CREAT, 384)
-    local err, fp = file_open_fd_new(fd, m.kFileWriteOnly, 0)
+    local err, fp = file_open_fd_new(fd, m.kFileWriteOnly)
     eq(0, err)
     eq(4, file_write(fp, 'test'))
-    eq(0, m.file_free(fp))
+    eq(0, m.file_free(fp, false))
     eq(4, lfs.attributes(filec).size)
     eq('test', io.open(filec):read('*a'))
   end)
@@ -148,7 +156,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rwx------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can create a rw------- file with kFileCreate', function()
@@ -156,7 +164,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rw-------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can create a rwx------ file with kFileCreateOnly', function()
@@ -164,7 +172,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rwx------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can create a rw------- file with kFileCreateOnly', function()
@@ -172,7 +180,7 @@ describe('file_open', function()
     eq(0, err)
     local attrs = lfs.attributes(filec)
     eq('rw-------', attrs.permissions)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('fails to open an existing file with kFileCreateOnly', function()
@@ -191,35 +199,35 @@ describe('file_open', function()
     local err, fp = file_open(file1, m.kFileCreate, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can open an existing file read-only with zero', function()
     local err, fp = file_open(file1, 0, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can open an existing file read-only with kFileReadOnly', function()
     local err, fp = file_open(file1, m.kFileReadOnly, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can open an existing file read-only with kFileNoSymlink', function()
     local err, fp = file_open(file1, m.kFileNoSymlink, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can truncate an existing file with kFileTruncate', function()
     local err, fp = file_open(file1, m.kFileTruncate, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     local attrs = lfs.attributes(file1)
     eq(0, attrs.size)
   end)
@@ -228,7 +236,7 @@ describe('file_open', function()
     local err, fp = file_open(file1, m.kFileWriteOnly, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     local attrs = lfs.attributes(file1)
     eq(4096, attrs.size)
   end)
@@ -245,7 +253,7 @@ describe('file_open', function()
     local err, fp = file_open(linkf, m.kFileTruncate, 384)
     eq(0, err)
     eq(true, fp.wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     local attrs = lfs.attributes(file1)
     eq(0, attrs.size)
   end)
@@ -271,7 +279,7 @@ describe('file_open_new', function()
     local err, fp = file_open_new(file1, 0, 384)
     eq(0, err)
     eq(false, fp.wr)
-    eq(0, m.file_free(fp))
+    eq(0, m.file_free(fp, false))
   end)
 
   itp('fails to open an existing file with kFileCreateOnly', function()
@@ -281,7 +289,29 @@ describe('file_open_new', function()
   end)
 end)
 
--- file_close is called above, so it is not tested directly
+describe('file_close', function()
+  itp('can flush writes to disk also with true argument', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, m.file_close(fp, true))
+    eq(wsize, lfs.attributes(filec).size)
+  end)
+end)
+
+describe('file_free', function()
+  itp('can flush writes to disk also with true argument', function()
+    local err, fp = file_open_new(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, m.file_free(fp, true))
+    eq(wsize, lfs.attributes(filec).size)
+  end)
+end)
 
 describe('file_fsync', function()
   itp('can flush writes to disk', function()
@@ -294,7 +324,22 @@ describe('file_fsync', function()
     eq(0, lfs.attributes(filec).size)
     eq(0, file_fsync(fp))
     eq(wsize, lfs.attributes(filec).size)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
+  end)
+end)
+
+describe('file_flush', function()
+  itp('can flush writes to disk', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, file_flush(fp))
+    eq(0, err)
+    eq(0, lfs.attributes(filec).size)
+    local wsize = file_write(fp, 'test')
+    eq(4, wsize)
+    eq(0, lfs.attributes(filec).size)
+    eq(0, file_flush(fp))
+    eq(wsize, lfs.attributes(filec).size)
+    eq(0, m.file_close(fp, false))
   end)
 end)
 
@@ -316,7 +361,7 @@ describe('file_read', function()
       eq({exp_err, exp_s}, {file_read(fp, size)})
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can read the whole file at once', function()
@@ -325,7 +370,7 @@ describe('file_read', function()
     eq(false, fp.wr)
     eq({#fcontents, fcontents}, {file_read(fp, #fcontents)})
     eq({0, ('\0'):rep(#fcontents)}, {file_read(fp, #fcontents)})
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can read more then 1024 bytes after reading a small chunk', function()
@@ -335,7 +380,7 @@ describe('file_read', function()
     eq({5, fcontents:sub(1, 5)}, {file_read(fp, 5)})
     eq({#fcontents - 5, fcontents:sub(6) .. (('\0'):rep(5))},
        {file_read(fp, #fcontents)})
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 
   itp('can read file by 768-byte-chunks', function()
@@ -355,7 +400,7 @@ describe('file_read', function()
       eq({exp_err, exp_s}, {file_read(fp, size)})
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 end)
 
@@ -366,7 +411,7 @@ describe('file_write', function()
     eq(true, fp.wr)
     local wr = file_write(fp, fcontents)
     eq(#fcontents, wr)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(wr, lfs.attributes(filec).size)
     eq(fcontents, io.open(filec):read('*a'))
   end)
@@ -383,7 +428,7 @@ describe('file_write', function()
       eq(wr, #s)
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(#fcontents, lfs.attributes(filec).size)
     eq(fcontents, io.open(filec):read('*a'))
   end)
@@ -400,12 +445,24 @@ describe('file_write', function()
       eq(wr, #s)
       shift = shift + size
     end
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
     eq(#fcontents, lfs.attributes(filec).size)
     eq(fcontents, io.open(filec):read('*a'))
   end)
 end)
 
+describe('msgpack_file_write', function()
+  itp('can write the whole file at once', function()
+    local err, fp = file_open(filec, m.kFileCreateOnly, 384)
+    eq(0, err)
+    eq(true, fp.wr)
+    local wr = msgpack_file_write(fp, fcontents)
+    eq(0, wr)
+    eq(0, m.file_close(fp, false))
+    eq(fcontents, io.open(filec):read('*a'))
+  end)
+end)
+
 describe('file_skip', function()
   itp('can skip 3 bytes', function()
     local err, fp = file_open(file1, 0, 384)
@@ -415,6 +472,6 @@ describe('file_skip', function()
     local rd, s = file_read(fp, 3)
     eq(3, rd)
     eq(fcontents:sub(4, 6), s)
-    eq(0, m.file_close(fp))
+    eq(0, m.file_close(fp, false))
   end)
 end)