update ltest

Author: actboy168

test/ltest.lua

@@ -573,16 +573,16 @@ local undump55; do
     local function LoadString()
         local size = LoadUnsigned(math.maxinteger)
         if size == 0 then
-            return nil
-        end
-        if size == 1 then
             local idx = LoadUnsigned(math.maxinteger)
+            if idx == 0 then
+                return nil
+            end
             if not cached[idx] then
                 error("invalid string index")
             end
             return cached[idx]
         end
-        local str = LoadCharN(size - 1)
+        local str = LoadCharN(size)
         cached[#cached + 1] = str
         return str
     end
@@ -689,7 +689,7 @@ local undump55; do
         f.linedefined = LoadInt()
         f.lastlinedefined = LoadInt()
         f.numparams = LoadByte()
-        f.is_vararg = LoadByte() & 1
+        f.is_vararg = LoadByte() & 3
         f.maxstacksize = LoadByte()
         LoadCode(f)
         LoadConstants(f)
@@ -748,11 +748,10 @@ return function(bytes)
 end
 ]]
 
-local coverage_start; do
-    local debug_getinfo = debug.getinfo
+local coverage = {}; do
     local include = {}
-    local m = {}
     local undump
+    local enable = false
 
     local function nextline(proto, abs, currentline, pc)
         local line = proto.lineinfo[pc]
@@ -763,6 +762,28 @@ local coverage_start; do
         end
     end
 
+    local function calc_actives_55(proto, actives)
+        local currentline = proto.linedefined
+        local abs = {}
+        for _, line in ipairs(proto.abslineinfo) do
+            abs[line.pc] = line.line
+        end
+        local start = 1
+        if proto.is_vararg > 0 then
+            local OP_VARARGPREP = 83
+            assert(proto.code[1] % 128 == OP_VARARGPREP)
+            currentline = nextline(proto, abs, currentline, 1)
+            start = 2
+        end
+        for pc = start, #proto.lineinfo do
+            currentline = nextline(proto, abs, currentline, pc)
+            actives[currentline] = true
+        end
+        for i = 1, proto.sizep do
+            calc_actives_55(proto.p[i], actives)
+        end
+    end
+
     local function calc_actives_54(proto, actives)
         local currentline = proto.linedefined
         local abs = {}
@@ -771,7 +792,8 @@ local coverage_start; do
         end
         local start = 1
         if proto.is_vararg > 0 then
-            assert(proto.code[1] % 128 == 81) -- OP_VARARGPREP
+            local OP_VARARGPREP = 81
+            assert(proto.code[1] % 128 == OP_VARARGPREP)
             currentline = nextline(proto, abs, currentline, 1)
             start = 2
         end
@@ -805,7 +827,9 @@ local coverage_start; do
         end
         local cl, version = undump(string.dump(assert(load(source))))
         local actives = {}
-        if version >= 0x54 then
+        if version >= 0x55 then
+            calc_actives_55(cl.f, actives)
+        elseif version == 0x54 then
             calc_actives_54(cl.f, actives)
         else
             calc_actives_53(cl.f, actives)
@@ -831,33 +855,43 @@ local coverage_start; do
     end
 
     local function debug_hook(_, lineno)
-        local file = include[debug_getinfo(2, "S").source]
+        local file = include[debug.getinfo(2, "S").source]
         if file then
             file[lineno] = true
         end
     end
 
-    function m.include(source, name)
+    function coverage.start()
+        enable = true
+        undump = assert(load(undump_script))()
+        debug.sethook(debug_hook, "l")
+    end
+
+    function coverage.include(name)
+        if not enable then
+            return
+        end
+        local path = assert(package.searchpath(name, package.path))
+        local f = assert(loadfile(path))
+        local source = debug.getinfo(f, "S").source
         if include[source] then
             include[source].name = name
         else
             include[source] = { name = name }
         end
     end
 
-    function m.start(co)
-        if co then
-            debug.sethook(co, debug_hook, "l")
-        else
-            debug.sethook(debug_hook, "l")
+    function coverage.stop()
+        if not enable then
+            return
         end
-    end
-
-    function m.stop()
         debug.sethook()
     end
 
-    function m.result()
+    function coverage.print_result()
+        if not enable then
+            return
+        end
         local str = {}
         for source, file in sortpairs(include) do
             local actives = get_actives(source)
@@ -882,23 +916,17 @@ local coverage_start; do
                     lines[#lines+1] = tostring(i)
                 end
             end
-            str[#str+1] = string.format("coverage: %02.02f%% (%d/%d) %s", pass / total * 100, pass, total, file.name)
+            str[#str+1] = string.format("coverage: %02.02f%% (%d/%d) module `%s`", pass / total * 100, pass, total, file.name)
             if #lines > 0 then
                 str[#str+1] = table.concat(lines, " ")
                 str[#str+1] = table.concat(status)
             end
         end
-        return table.concat(str, "\n")
-    end
-
-    function coverage_start()
-        undump = assert(load(undump_script))()
-        return m
+        print(table.concat(str, "\n"))
     end
 end
 
 local m = {}
-local coverage
 
 local function split(str)
     local r = {}
@@ -1313,9 +1341,7 @@ function m.run()
         end
     end
     local duration = os.clock() - startTime
-    if coverage then
-        coverage.stop()
-    end
+    coverage.stop()
     if options.verbosity then
         print("=========================================================")
     else
@@ -1331,21 +1357,18 @@ function m.run()
             print()
         end
     end
-    if coverage then
-        print(coverage.result())
-    end
-    local s = string.format("Ran %d tests in %0.3f seconds, %d successes, %d failures", #selected, duration, successes, #failures)
-    if #selected - successes - #failures > 0 then
-        s = s..string.format(", %d skipped", (#selected - successes - #failures))
+    coverage.print_result()
+    local skipped = #selected - successes - #failures
+    if skipped <= 0 then
+        print(string.format("Ran %d tests in %0.3f seconds, %d successes, %d failures", #selected, duration, successes, #failures))
+    else
+        print(string.format("Ran %d tests in %0.3f seconds, %d successes, %d failures, %d skipped", #selected, duration, successes, #failures, skipped))
     end
-    print(s)
     if #failures == 0 then
         print("OK")
         if options.touch then
             touch(options.touch)
         end
-    end
-    if #failures == 0 then
         return 0
     end
     return 1
@@ -1356,26 +1379,19 @@ function m.skip(name)
 end
 
 function m.moduleCoverage(name)
-    if not coverage then
-        return
-    end
-    local path = assert(package.searchpath(name, package.path))
-    local f = assert(loadfile(path))
-    local source = debug.getinfo(f, "S").source
-    coverage.include(source, ("module `%s`"):format(name))
+    coverage.include(name)
 end
 
+m.options = options
+m.stringify = stringify
+
 if options.coverage then
-    local LuaVersion = (function ()
-        local major, minor = _VERSION:match "Lua (%d)%.(%d)"
-        return tonumber(major) * 10 + tonumber(minor)
-    end)()
-    if LuaVersion == 53 or LuaVersion == 54 or LuaVersion == 55 then
-        coverage = coverage_start()
-        coverage.start()
+    local major, minor = _VERSION:match "Lua (%d)%.(%d)"
+    if major == "5" then
+        if minor == "3" or minor == "4" or minor == "5" then
+            coverage.start()
+        end
     end
 end
-m.options = options
-m.stringify = stringify
 
 return m