# 
# 
# patch "tests/common/cvs.lua"
#  from [b6d3b0aece6b3ec5e1128a702e49f387726ba757]
#    to [f784612e3586736572e71dc5f9f61052e2cb2b0d]
# 
# patch "tests/empty_environment/__driver__.lua"
#  from [ef14b54a081141191e3eabdb7880844a5bf947f9]
#    to [4e70feabad49fb196e7637136cd66b5a4f54b59d]
# 
# patch "tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua"
#  from [69f6de9a36e8ea25ec26546a3f0b013d7d6e1833]
#    to [4b38d49257d21476063a03e3912fb2d92a0e9271]
# 
# patch "tests/fail_cleanly_on_unreadable_db/__driver__.lua"
#  from [62b282400e59896964a7b32e123b14c68971b71b]
#    to [6a2bf129b629429fb3c9d4d10241780041d497ba]
# 
============================================================
--- tests/common/cvs.lua	b6d3b0aece6b3ec5e1128a702e49f387726ba757
+++ tests/common/cvs.lua	f784612e3586736572e71dc5f9f61052e2cb2b0d
@@ -1,8 +1,8 @@ function cvs(...)
 skip_if(not existsonpath("cvs"))
 
 function cvs(...)
   local what
-  if os.getenv("OSTYPE") == "msys" then
+  if ostype == "Windows" then
     what = {"cvs", "-d", cvsroot_nix, unpack(arg)}
   else
     what = {"cvs", "-d", cvsroot, unpack(arg)}
@@ -22,7 +22,7 @@ function cvs_setup()
   -- if we're mingw/msys, we need to replace the Windows drive
   -- <letter>: with /<letter> , or CVS will think it's a remote
   -- repository
-  if os.getenv("OSTYPE") == "msys" then
+  if ostype == "Windows" then
     cvsroot_nix = string.gsub(cvsroot, "^(%a):", "/%1")
   end
   check(cvs("-q", "init"), 0, false, false)
============================================================
--- tests/empty_environment/__driver__.lua	ef14b54a081141191e3eabdb7880844a5bf947f9
+++ tests/empty_environment/__driver__.lua	4e70feabad49fb196e7637136cd66b5a4f54b59d
@@ -6,20 +6,26 @@ end
   return {"env", "-i", unpack(mtn(unpack(arg)))}
 end
 
-if os.getenv("OSTYPE") == "msys" then
+if ostype == "Windows" then
   local iconv = getpathof("libiconv-2", ".dll")
   local zlib = getpathof("zlib1", ".dll")
   copy(iconv, "libiconv-2.dll")
   copy(zlib, "zlib1.dll")
-elseif os.getenv("OSTYPE") == "cygwin" then
+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")
+  local boostfile = getpathof("cygboost_filesystem-gcc-mt-1_33_1", ".dll")
+  local boostregex = getpathof("cygboost_regex-gcc-mt-1_33_1", ".dll")
   copy(cygwin, "cygwin1.dll")
   copy(iconv, "cygiconv-2.dll")
   copy(intl, "cygintl-3.dll")
+  copy(intl8, "cygintl-8.dll")
   copy(zlib, "cygz.dll")
+  copy(boostfile, "cygboost_filesystem-gcc-mt-1_33_1.dll")
+  copy(boostregex, "cygboost_regex-gcc-mt-1_33_1.dll")
 end
 
 check(noenv_mtn("--help"), 0, false, false)
============================================================
--- tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua	69f6de9a36e8ea25ec26546a3f0b013d7d6e1833
+++ tests/fail_cleanly_on_unreadable__MTN_options/__driver__.lua	4b38d49257d21476063a03e3912fb2d92a0e9271
@@ -1,5 +1,6 @@ skip_if(ostype == "Windows")
 
 skip_if(ostype == "Windows")
+skip_if(string.sub(ostype, 1, 6, "CYGWIN"))
 skip_if(not existsonpath("chmod"))
 mtn_setup()
 
============================================================
--- tests/fail_cleanly_on_unreadable_db/__driver__.lua	62b282400e59896964a7b32e123b14c68971b71b
+++ tests/fail_cleanly_on_unreadable_db/__driver__.lua	6a2bf129b629429fb3c9d4d10241780041d497ba
@@ -1,5 +1,6 @@ skip_if(ostype == "Windows")
 
 skip_if(ostype == "Windows")
+skip_if(string.sub(ostype, 1, 6) == "CYGWIN")
 skip_if(not existsonpath("chmod"))
 mtn_setup()