From 4b6913bb8c1043e732aa3b35d1d892f0b5d795c7 Mon Sep 17 00:00:00 2001 From: Ken Brown Date: Sat, 25 Mar 2023 16:37:51 -0400 Subject: [PATCH] Skip failing tests on Cygwin with native compilation (bug#624XX) * test/Makefile.in (TEST_NATIVE_COMP): New variable, used to determine whether to run tests tagged with :nativecomp. Set it to "no" on Cygwin and to $(HAVE_NATIVE_COMP) otherwise. * test/lisp/emacs-lisp/benchmark-tests.el (benchmark-tests): Skip on Cygwin with native-compilation. --- test/Makefile.in | 7 ++++++- test/lisp/emacs-lisp/benchmark-tests.el | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/test/Makefile.in b/test/Makefile.in index fd21695f5bc9..0e4f3f31122a 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -124,7 +124,12 @@ .PHONY: all: check -ifeq ($(HAVE_NATIVE_COMP),yes) +SYSTEM_TYPE = @SYSTEM_TYPE@ +TEST_NATIVE_COMP = $(HAVE_NATIVE_COMP) +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 31357f24a0de..9c57a2af4ac8 100644 --- a/test/lisp/emacs-lisp/benchmark-tests.el +++ b/test/lisp/emacs-lisp/benchmark-tests.el @@ -23,6 +23,8 @@ (require 'ert) (ert-deftest benchmark-tests () + (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))))) -- 2.39.0