# # # patch "ChangeLog" # from [68e59bbe4dfb2e08a20f56d0187f528514cd3b66] # to [fd26fda1d224fd66f3f13562761a70fe725d7fd7] # # patch "tests/empty_environment/__driver__.lua" # from [ca63a02b4add10e72aa3a1f29906bdfea72dae32] # to [99ac24ed4638a090c2f0867c2652f3356cebd470] # ============================================================ --- ChangeLog 68e59bbe4dfb2e08a20f56d0187f528514cd3b66 +++ ChangeLog fd26fda1d224fd66f3f13562761a70fe725d7fd7 @@ -1,5 +1,7 @@ 2006-06-21 Matthew Gregan + * tests/empty_environment/__driver__.lua: Fix test on Cygwin--copy + essential DLLs into current directory before emptying $PATH. * win32/monotone.iss: Remove hardcoded paths that were accidentally left in after debugging. ============================================================ --- tests/empty_environment/__driver__.lua ca63a02b4add10e72aa3a1f29906bdfea72dae32 +++ tests/empty_environment/__driver__.lua 99ac24ed4638a090c2f0867c2652f3356cebd470 @@ -11,6 +11,15 @@ local zlib = getpathof("zlib1", ".dll") copy(iconv, "libiconv-2.dll") copy(zlib, "zlib1.dll") +elseif os.getenv("OSTYPE") == "cygwin" then + local cygwin = getpathof("cygwin1", ".dll") + local iconv = getpathof("cygiconv-2", ".dll") + local intl = getpathof("cygintl-3", ".dll") + local zlib = getpathof("cygz", ".dll") + copy(cygwin, "cygwin1.dll") + copy(iconv, "cygiconv-2.dll") + copy(intl, "cygintl-3.dll") + copy(zlib, "cygz.dll") end check(noenv_mtn("--help"), 2, false, false)