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

3 files changed, 27 insertions, 18 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
diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index b000f128278..d1fef0187d4 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -256,24 +256,22 @@ test-eglot:
     # This is needed in order to get a JUnit test report.
     make_params: '-k -C test check-expensive LOGFILES="lisp/progmodes/eglot-tests.log"'
 
-# The next two jobs are commented out due to bug#62210.
-
-# build-image-gnustep:
-#   stage: platform-images
-#   extends: [.job-template, .build-template, .gnustep-template]
-#   variables:
-#     target: emacs-gnustep
+build-image-gnustep:
+  stage: platform-images
+  extends: [.job-template, .build-template, .gnustep-template]
+  variables:
+    target: emacs-gnustep
 
-# test-gnustep:
-#   # This tests the GNUstep build process.
-#   stage: platforms
-#   extends: [.job-template, .gnustep-template]
-#   needs:
-#     - job: build-image-gnustep
-#       optional: true
-#   variables:
-#     target: emacs-gnustep
-#     make_params: install
+test-gnustep:
+  # This tests the GNUstep build process.
+  stage: platforms
+  extends: [.job-template, .gnustep-template]
+  needs:
+    - job: build-image-gnustep
+      optional: true
+  variables:
+    target: emacs-gnustep
+    make_params: install
 
 # The next two jobs are commented out due to high workload on
 # emba.gnu.org.
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)))))