From f7ec0d94d08bdd035ae710e338fd0839595b0087 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Thu, 28 Nov 2013 19:35:13 +0200
Subject: [PATCH 1/1] Fix the test suite on Windows.

 configure.ac (PATH_SEP): Set and AC_SUBST.

 test/automated/Makefile.in (PATH_SEP): Set this instead of
 PATH_SEPARATOR.
 (EMACSOPT): Use $(PATH_SEP).
---
 ChangeLog                  |  4 ++++
 configure.ac               | 16 ++++++++++++++++
 test/ChangeLog             |  6 ++++++
 test/automated/Makefile.in |  4 ++--
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 278c77faf8..092f7e5812 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* configure.ac (PATH_SEP): Set and AC_SUBST.
+
 2013-11-27  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Merge from gnulib, incorporating:
diff --git a/configure.ac b/configure.ac
index 48343eb043..88611b8877 100644
--- a/configure.ac
+++ b/configure.ac
@@ -923,6 +923,22 @@ if test "$opsys" = "mingw32"; then
   LN_S="ln"
 fi
 
+dnl This is for MinGW, and is used in test/automated/Makefile.in.
+dnl The MSYS Bash has heuristics for replacing ':' with ';' when it
+dnl decides that a command-line argument to be passed to a MinGW program
+dnl is a PATH-style list of directories.  But that heuristics plays it
+dnl safe, and only does the replacement when it is _absolutely_ sure it
+dnl sees a colon-seperated list of file names; e.g. ":." is left alone,
+dnl which breaks in-tree builds.  So we do this manually instead.
+dnl Note that we cannot rely on PATH_SEPARATOR, as that one will always
+dnl be computed as ':' in MSYS Bash.
+if test "$opsys" = "mingw32"; then
+  PATH_SEP=';'
+else
+  PATH_SEP=':'
+fi
+AC_SUBST(PATH_SEP)
+
 AC_PATH_PROG(INSTALL_INFO, install-info, :,
   $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
 dnl Don't use GZIP, which is used by gzip for additional parameters.
diff --git a/test/ChangeLog b/test/ChangeLog
index fd54464528..4455cf0379 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,9 @@
+2013-11-28  Eli Zaretskii  <eliz@gnu.org>
+
+	* automated/Makefile.in (PATH_SEP): Set this instead of
+	PATH_SEPARATOR.
+	(EMACSOPT): Use $(PATH_SEP).
+
 2013-11-28  Michael Albinus  <michael.albinus@gmx.de>
 
 	* automated/file-notify-tests.el (auto-revert-stop-on-user-input):
diff --git a/test/automated/Makefile.in b/test/automated/Makefile.in
index d187fa607b..fa2fddfea8 100644
--- a/test/automated/Makefile.in
+++ b/test/automated/Makefile.in
@@ -22,7 +22,7 @@ SHELL = @SHELL@
 srcdir = @srcdir@
 VPATH = $(srcdir)
 
-PATH_SEPARATOR = @PATH_SEPARATOR@
+PATH_SEP = @PATH_SEP@
 
 # Empty for all systems except MinGW, where xargs needs an explicit
 # limitation.
@@ -36,7 +36,7 @@ EMACS = ../../src/emacs
 # Command line flags for Emacs.
 # Apparently MSYS bash would convert "-L :" to "-L ;" anyway,
 # but we might as well be explicit.
-EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(PATH_SEPARATOR)$(srcdir)"
+EMACSOPT = -batch --no-site-file --no-site-lisp -L "$(PATH_SEP)$(srcdir)"
 
 # Extra flags to pass to the byte compiler.
 BYTE_COMPILE_EXTRA_FLAGS =
-- 
2.20.1