diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:59 -0400 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2023-03-27 17:16:59 -0400 |
commit | 47bce04e875bdaf4a9e2bb33dc14794d373b676f (patch) | |
tree | d13dae0c30b300e332292f6fb8fd2ce13b500889 /test/Makefile.in | |
parent | 2b4e14e3abd5be08ee2a4e832b5dbe8172869e24 (diff) | |
parent | 0337131bfa194856234ddfe70ee38b3165d66289 (diff) | |
download | emacs-47bce04e875bdaf4a9e2bb33dc14794d373b676f.tar.gz |
Merge from origin/emacs-29
0337131bfa1 Update to Transient v0.3.7-218-g3dbb22a
a8c23677d39 Update to Org 9.6.2
45b16bfb496 Skip failing tests on Cygwin with native compilation (bug...
8b4a494d8d4 Fix GNUSTEP tests on EMBA
# Conflicts:
# test/infra/gitlab-ci.yml
Diffstat (limited to 'test/Makefile.in')
-rw-r--r-- | test/Makefile.in | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/test/Makefile.in b/test/Makefile.in index f4b85e7dfe5..e2a14c4dd92 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -124,7 +124,14 @@ test_module_dir := src/emacs-module-resources all: check -ifeq ($(HAVE_NATIVE_COMP),yes) +SYSTEM_TYPE = @SYSTEM_TYPE@ +TEST_NATIVE_COMP = $(HAVE_NATIVE_COMP) +# Avoid fork failures on Cygwin. See bug#62450 and etc/PROBLEMS +# ("Fork failures in a build with native compilation"). +ifeq ($(SYSTEM_TYPE),cygwin) +TEST_NATIVE_COMP = no +endif +ifeq ($(TEST_NATIVE_COMP),yes) SELECTOR_DEFAULT = (not (or (tag :expensive-test) (tag :unstable))) SELECTOR_EXPENSIVE = (not (tag :unstable)) SELECTOR_ALL = t |