[Emacs-diffs] trunk r115267: Fix the test suite on Windows.

[Eli Zaretskii]

------------------------------------------------------------
revno: 115267
revision-id: address@hidden
parent: address@hidden
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Thu 2013-11-28 19:35:13 +0200
message:
  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).
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783
  test/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-8588
  test/automated/Makefile.in     makefile.in-20110112160650-056hnl9qhpjvjicy-6

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-11-27 23:58:03 +0000
+++ b/ChangeLog 2013-11-28 17:35:13 +0000
@@ -1,3 +1,7 @@
+2013-11-28  Eli Zaretskii  <address@hidden>
+
+       * configure.ac (PATH_SEP): Set and AC_SUBST.
+
 2013-11-27  Paul Eggert  <address@hidden>
 
        Merge from gnulib, incorporating:

=== modified file 'configure.ac'
--- a/configure.ac      2013-11-27 06:15:06 +0000
+++ b/configure.ac      2013-11-28 17:35:13 +0000
@@ -923,6 +923,22 @@
   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.

=== modified file 'test/ChangeLog'
--- a/test/ChangeLog    2013-11-28 16:14:13 +0000
+++ b/test/ChangeLog    2013-11-28 17:35:13 +0000
@@ -1,3 +1,9 @@
+2013-11-28  Eli Zaretskii  <address@hidden>
+
+       * automated/Makefile.in (PATH_SEP): Set this instead of
+       PATH_SEPARATOR.
+       (EMACSOPT): Use $(PATH_SEP).
+
 2013-11-28  Michael Albinus  <address@hidden>
 
        * automated/file-notify-tests.el (auto-revert-stop-on-user-input):

=== modified file 'test/automated/Makefile.in'
--- a/test/automated/Makefile.in        2013-11-23 01:55:16 +0000
+++ b/test/automated/Makefile.in        2013-11-28 17:35:13 +0000
@@ -22,7 +22,7 @@
 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 @@
 # 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 =