#
#
# patch "tests/empty_environment/__driver__.lua"
#  from [d5ee7917536ab68d5b1bcd860f8d813e0788d2fc]
#    to [e026ebed80d4543a4ada9b7e8453409866fc63dd]
# 
# patch "tests/skip_invalid_paths/__driver__.lua"
#  from [66292299b8a1784a6ebb57ac6ae708513c1ae026]
#    to [482cbe86e9545c3615390887ff7e150d0c360084]
#
============================================================
--- tests/empty_environment/__driver__.lua	d5ee7917536ab68d5b1bcd860f8d813e0788d2fc
+++ tests/empty_environment/__driver__.lua	e026ebed80d4543a4ada9b7e8453409866fc63dd
@@ -25,16 +25,21 @@ elseif string.sub(ostype, 1, 6) == "CYGW
   copy(intl, "libintl-8.dll")
   copy(zlib, "zlib1.dll")
 elseif string.sub(ostype, 1, 6) == "CYGWIN" then
-  local cygwin = getpathof("cygwin1", ".dll")
-  local iconv = getpathof("cygiconv-2", ".dll")
-  local intl = getpathof("cygintl-3", ".dll")
-  local intl8 = getpathof("cygintl-8", ".dll")
-  local zlib = getpathof("cygz", ".dll")
-  copy(cygwin, "cygwin1.dll")
-  copy(iconv, "cygiconv-2.dll")
-  copy(intl, "cygintl-3.dll")
-  copy(intl8, "cygintl-8.dll")
-  copy(zlib, "cygz.dll")
+  for _,name in pairs({
+                        "cyggcc_s-1",
+                        "cygiconv-2",
+                        "cygidn-11",
+                        "cygintl-8",
+                        "cyglua-5.1",
+                        "cygpcre-0",
+                        "cygsqlite3-0",
+                        "cygstdc++-6",
+                        "cygwin1",
+                        "cygz",
+		      }) do
+    local file = getpathof(name, ".dll")
+    copy(file, name..".dll");
+  end
 end
 
 check(noenv_mtn("--help"), 0, false, false)
============================================================
--- tests/skip_invalid_paths/__driver__.lua	66292299b8a1784a6ebb57ac6ae708513c1ae026
+++ tests/skip_invalid_paths/__driver__.lua	482cbe86e9545c3615390887ff7e150d0c360084
@@ -1,6 +1,6 @@
 
 -- we can't create the test files which trigger the warnings on win anyways
-skip_if(ostype=="Windows")
+skip_if(ostype=="Windows" or string.sub(ostype, 1, 6) == "CYGWIN")
 
 mtn_setup()