diff --git a/test/Makefile.in b/test/Makefile.in index fd21695f5bc..e8edf7739b7 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 diff --git a/test/lisp/emacs-lisp/benchmark-tests.el b/test/lisp/emacs-lisp/benchmark-tests.el index 31357f24a0d..99b5b142c37 100644 --- a/test/lisp/emacs-lisp/benchmark-tests.el +++ b/test/lisp/emacs-lisp/benchmark-tests.el @@ -23,6 +23,10 @@ (require 'ert) (ert-deftest benchmark-tests () + ;; Avoid fork failures on Cygwin. See bug#62450 and etc/PROBLEMS + ;; ("Fork failures in a build with native compilation"). + (skip-unless (not (and (eq system-type 'cygwin) + (featurep 'native-compile)))) (let (str t-long t-short m) (should (consp (benchmark-run nil (setq m (1+ 0))))) (should (consp (benchmark-run 1 (setq m (1+ 0)))))