# 
# 
# patch "ChangeLog"
#  from [0e609783a145d6bbd97bda573f9cfcc71bce8722]
#    to [df1998d7aa63eef1e3f9870db377d0efc777e209]
# 
# patch "tests/t_empty_env.at"
#  from [b101bf28b4d6cb3b13f25b349f459092280c8f7e]
#    to [94f0bbe53b830ad8660cb237b7a9a5a9ef3abe50]
# 
# patch "tests/t_ls_branches.at"
#  from [caac8dadea76a6ee60b9a9e11390e0b49fd0251a]
#    to [b96dbaccc7d0a4414bc79bcb9cee51b1dc58be20]
# 
# patch "tests/t_pidfile_log_permissions.at"
#  from [e22435a9061668b974facea257d6715dde6ddc42]
#    to [209d35933120c7dfddb41b328e2f50eb81c64e7a]
# 
============================================================
--- ChangeLog	0e609783a145d6bbd97bda573f9cfcc71bce8722
+++ ChangeLog	df1998d7aa63eef1e3f9870db377d0efc777e209
@@ -1,3 +1,16 @@
+2006-04-15  Matthew Gregan  <address@hidden>
+
+	* tests/t_empty_env.at: Remove LD_LIBRARY_PATH test; it was
+	causing the test to be skipped without good reason in too many
+	environments.
+
+	* tests/t_ls_branches.at: Tweak include and exclude patterns to
+	avoid spurious glob expansion under MinGW.
+
+	* tests/t_pidfile_log_permissions.at: Skip part of the test under
+	MinGW since we can't get UNIX permissions to map to the particular
+	NT permissions we'd need for this portion of the test.
+
 2006-04-14  Richard Levitte  <address@hidden>
 
 	* commands.cc (CMD(setup)): Make this a CMD_NO_WORKSPACE.  The
============================================================
--- tests/t_empty_env.at	b101bf28b4d6cb3b13f25b349f459092280c8f7e
+++ tests/t_empty_env.at	94f0bbe53b830ad8660cb237b7a9a5a9ef3abe50
@@ -1,13 +1,6 @@
 AT_SETUP([empty environment])
 MTN_SETUP
 
-# sigh.  skip this test if the user happens to have LD_LIBRARY_PATH set,
-# because there's a chance it might be set so that their monotone binary can
-# find boost DSOs or something.
-AT_CHECK(if test "$LD_LIBRARY_PATH"; then
-  exit 77;
-fi)
-
 AT_CHECK(if test "$OSTYPE" = "msys"; then
   cp $(which libiconv-2.dll) .
   cp $(which zlib1.dll) .
============================================================
--- tests/t_ls_branches.at	caac8dadea76a6ee60b9a9e11390e0b49fd0251a
+++ tests/t_ls_branches.at	b96dbaccc7d0a4414bc79bcb9cee51b1dc58be20
@@ -31,13 +31,13 @@
 ])
 AT_CHECK(cmp branches stdout,[],[ignore])
 
-AT_CHECK(MTN ls branches "other*",[0],[stdout],[stderr])
+AT_CHECK(MTN ls branches "otherbr*",[0],[stdout],[stderr])
 AT_CHECK(CANONICALISE(stdout))
 AT_DATA(branches2,[otherbranch
 ])
 AT_CHECK(cmp branches2 stdout,[],[ignore])
 
-AT_CHECK(MTN ls branches --exclude "test*",[0],[stdout],[stderr])
+AT_CHECK(MTN ls branches --exclude "testbr*",[0],[stdout],[stderr])
 AT_CHECK(CANONICALISE(stdout))
 AT_CHECK(cmp branches2 stdout,[],[ignore])
 
============================================================
--- tests/t_pidfile_log_permissions.at	e22435a9061668b974facea257d6715dde6ddc42
+++ tests/t_pidfile_log_permissions.at	209d35933120c7dfddb41b328e2f50eb81c64e7a
@@ -11,19 +11,23 @@
 AT_CHECK(chmod 400 ro.log)
 AT_CHECK(MTN --log=ro.log status, [1], [ignore], [ignore])
 
-# it should also fail if a parent directory of the file is not accessible.
-AT_CHECK(mkdir noaccess)
-AT_CHECK(chmod 100 noaccess)
-AT_CHECK(MTN --log=noaccess/my.log status, [1], [ignore], [ignore])
+# skip part of the test on win32 for now as the permission restrictions
+# don't map to the NT permissions we need.
+if test "$OSTYPE" != "msys"; then
+  # it should also fail if a parent directory of the file is not accessible.
+  AT_CHECK(mkdir noaccess)
+  AT_CHECK(chmod 100 noaccess)
+  AT_CHECK(MTN --log=noaccess/my.log status, [1], [ignore], [ignore])
 
-NETSYNC_SETUP
+  NETSYNC_SETUP
 
-# --pid-file checks that the file doesn't exist.  check that we fail if we
-# can't create the specified file.
-AT_CHECK(MTN serve --pid-file=noaccess/my.pid --bind=127.0.0.1:$_PORT testbranch, [1], [ignore], [ignore])
+  # --pid-file checks that the file doesn't exist.  check that we fail if we
+  # can't create the specified file.
+  AT_CHECK(MTN serve --pid-file=noaccess/my.pid --bind=127.0.0.1:$_PORT testbranch, [1], [ignore], [ignore])
 
-# no need to kill the server--if the test succeeded the server must have
-# failed to start.
+  # no need to kill the server--if the test succeeded the server must have
+  # failed to start.
+fi
 
 AT_CHECK(chmod 600 inaccessible.log ro.log noaccess)
 AT_CHECK(rm -f inaccessible.log ro.log)