ignore self in coverage output

Author: justarandomgeek

control.lua

@@ -42,7 +42,10 @@ local function stop()
   runningtestname = nil
   callAll("stop")
 end
+-- These mod names will remain in __modname__ format, rather than being translated
 local nopathmods = {level=true,base=true,core=true}
+-- These mods will be omitted from output entirely
+local ignoremods = {coverage = true}
 local function report()
   if runningtestname then stop() end
   local moddumps = callAll("dump")
@@ -51,40 +54,42 @@ local function report()
   for dumpname,dump in pairs(moddumps) do
     for testname,files in pairs(dump.tests) do
       for file,lines in pairs(files) do
-        outlines[#outlines+1] = string.format("TN:%s [%s]\n",testname,dumpname)
         local modname,filename = file:match("__(.+)__/(.+)")
-        if not modname then
-          --startup tracing sometimes gives absolute path of the scenario script, turn it back into the usual form...
-          filename = file:match("currently%-playing/(.+)")
-          if filename then 
-            modname = "level"
+        if not ignoremods[modname] then
+          outlines[#outlines+1] = string.format("TN:%s [%s]\n",testname,dumpname)
+          if not modname then
+            --startup tracing sometimes gives absolute path of the scenario script, turn it back into the usual form...
+            filename = file:match("currently%-playing/(.+)")
+            if filename then 
+              modname = "level"
+            end
           end
-        end
-        -- scenario scripts may provide hints to where they came from...
-        if modname == "level" then 
-          local level = moddumps.level
-          local levelpath = level and level.levelpath
-          if levelpath then
-            modname = levelpath.modname
-            filename = levelpath.basepath .. filename
+          -- scenario scripts may provide hints to where they came from...
+          if modname == "level" then 
+            local level = moddumps.level
+            local levelpath = level and level.levelpath
+            if levelpath then
+              modname = levelpath.modname
+              filename = levelpath.basepath .. filename
+            end
           end
+          if nopathmods[modname] then
+            -- we *still* can't identify level properly, so just give up...
+            -- also, we can't create proper paths for core/base anyway
+            outlines[#outlines+1] = string.format("SF:__%s__/%s\n",modname,filename)
+          elseif modname == nil then
+            --something totally unrecognized?
+            outlines[#outlines+1] = string.format("SF:%s\n",file)
+          else
+            -- we found it! This will be a path relative to the `mods` directory.
+            local modver = game.active_mods[modname]
+            outlines[#outlines+1] = string.format("SF:./%s_%s/%s\n",modname,modver,filename)
+          end
+          for line,count in pairs(lines) do
+            outlines[#outlines+1] = string.format("DA:%d,%d\n",line,count)
+          end
+          outlines[#outlines+1] = "end_of_record\n"
         end
-        if nopathmods[modname] then
-          -- we *still* can't identify level properly, so just give up...
-          -- also, we can't create proper paths for core/base anyway
-          outlines[#outlines+1] = string.format("SF:__%s__/%s\n",modname,filename)
-        elseif modname == nil then
-          --something totally unrecognized?
-          outlines[#outlines+1] = string.format("SF:%s\n",file)
-        else
-          -- we found it! This will be a path relative to the `mods` directory.
-          local modver = game.active_mods[modname]
-          outlines[#outlines+1] = string.format("SF:./%s_%s/%s\n",modname,modver,filename)
-        end
-        for line,count in pairs(lines) do
-          outlines[#outlines+1] = string.format("DA:%d,%d\n",line,count)
-        end
-        outlines[#outlines+1] = "end_of_record\n"
       end
     end
   end