masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 19:03:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the test suite on Windows.

Browse source 
configure.ac (PATH_SEP): Set and AC_SUBST.

 test/automated/Makefile.in (PATH_SEP): Set this instead of
 PATH_SEPARATOR.
 (EMACSOPT): Use $(PATH_SEP).
This commit is contained in:
Eli Zaretskii 2013-11-28 19:35:13 +02:00
parent 23293cb07a
commit f7ec0d94d0
4 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -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> 2013-11-27 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating: Merge from gnulib, incorporating:

16
configure.ac
View file

@ -923,6 +923,22 @@ if test "$opsys" = "mingw32"; then
LN_S="ln" LN_S="ln"
fi 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, :, AC_PATH_PROG(INSTALL_INFO, install-info, :,
$PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin) $PATH$PATH_SEPARATOR/usr/sbin$PATH_SEPARATOR/sbin)
dnl Don't use GZIP, which is used by gzip for additional parameters. dnl Don't use GZIP, which is used by gzip for additional parameters.

6
test/ChangeLog
View file

@ -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> 2013-11-28 Michael Albinus <michael.albinus@gmx.de>
* automated/file-notify-tests.el (auto-revert-stop-on-user-input): * automated/file-notify-tests.el (auto-revert-stop-on-user-input):

4
test/automated/Makefile.in
View file

@ -22,7 +22,7 @@ SHELL = @SHELL@
srcdir = @srcdir@ srcdir = @srcdir@
VPATH = $(srcdir) VPATH = $(srcdir)
PATH_SEPARATOR = @PATH_SEPARATOR@ PATH_SEP = @PATH_SEP@
# Empty for all systems except MinGW, where xargs needs an explicit # Empty for all systems except MinGW, where xargs needs an explicit
# limitation. # limitation.
@ -36,7 +36,7 @@ EMACS = ../../src/emacs
# Command line flags for Emacs. # Command line flags for Emacs.
# Apparently MSYS bash would convert "-L :" to "-L ;" anyway, # Apparently MSYS bash would convert "-L :" to "-L ;" anyway,
# but we might as well be explicit. # 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. # Extra flags to pass to the byte compiler.
BYTE_COMPILE_EXTRA_FLAGS = BYTE_COMPILE_EXTRA_FLAGS =