#
#
# patch "testlib.lua"
#  from [27ec5ecea2cd80cb45f6a3d44f3cbae31b8dd360]
#    to [04312bf98f78a087519d291c4fe4f79d50fa85f7]
# 
# patch "tests/manifest_restrictions/__driver__.lua"
#  from [83cb52d1aa70372b3596e999c2d8e75c58038e95]
#    to [3da1c4826eecb7e36b4ff378b0060850389e8b30]
#
============================================================
--- testlib.lua	27ec5ecea2cd80cb45f6a3d44f3cbae31b8dd360
+++ testlib.lua	04312bf98f78a087519d291c4fe4f79d50fa85f7
@@ -528,11 +528,11 @@ function grep(...)
                    if where ~= nil then infile:close() end
                    return out
                  end
-  return {dogrep, logline = "grep "..cmd_as_str(arg)}
+  return {dogrep, logline = "grep "..cmd_as_str({...})}
 end
 
 function cat(...)
-  local arguments = arg
+  local arguments = {...}
   local function docat()
     local bsize = 8*1024
     for _,x in ipairs(arguments) do
@@ -553,7 +553,7 @@ function cat(...)
     end
     return 0
   end
-  return {docat, logline = "cat "..cmd_as_str(arg)}
+  return {docat, logline = "cat "..cmd_as_str({...})}
 end
 
 function tail(...)
@@ -572,7 +572,7 @@ function tail(...)
     end
     return 0
   end
-  return {dotail, logline = "tail "..cmd_as_str(arg)}
+  return {dotail, logline = "tail "..cmd_as_str({...})}
 end
 
 function sort(file)
============================================================
--- tests/manifest_restrictions/__driver__.lua	83cb52d1aa70372b3596e999c2d8e75c58038e95
+++ tests/manifest_restrictions/__driver__.lua	3da1c4826eecb7e36b4ff378b0060850389e8b30
@@ -87,7 +87,7 @@ function included(...)
 function included(...)
   local missed = {}
   local ok = true
-  for _,x in ipairs(arg) do
+  for _,x in ipairs({...}) do
     if not qgrep("work/file"..x, "stdout") then
       table.insert(missed, x)
       ok = false
@@ -102,7 +102,7 @@ function excluded(...)
 function excluded(...)
   local missed = {}
   local ok = true
-  for _,x in ipairs(arg) do
+  for _,x in ipairs({...}) do
     if qgrep("work/file"..x, "stdout") then
       table.insert(missed, x)
       ok = false