From 52b47615b40d92d64d878b2053c49e9c702f2413 Mon Sep 17 00:00:00 2001
From: dickmao <dick.r.chiang@gmail.com>
Date: Mon, 25 Oct 2021 21:54:48 -0400
Subject: [PATCH] EMBA's raison d'etre is warming the planet epsilon degrees

... since even if it found a problem, no one's watching it.

* test/lisp/progmodes/elisp-mode-tests.el (find-defs-defvar-el):
Fix a test for a variable removed in 65b34f6.
* test/infra/gitlab-ci.yml:
Run `make check` so I don't have to.
---
 test/infra/gitlab-ci.yml                | 23 ++++-------------------
 test/lisp/progmodes/elisp-mode-tests.el |  6 +++---
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/test/infra/gitlab-ci.yml b/test/infra/gitlab-ci.yml
index 57f90b15ef..de92bb2077 100644
--- a/test/infra/gitlab-ci.yml
+++ b/test/infra/gitlab-ci.yml
@@ -150,9 +150,9 @@ default:
     - docker push ${CI_REGISTRY_IMAGE}:${target}-${BUILD_TAG}
 
 .test-template:
-  # Do not run fast and normal test jobs when scheduled.
+  # Do not run normal test jobs when scheduled.
   rules:
-    - if: '$CI_JOB_STAGE =~ "fast|normal" && $CI_PIPELINE_SOURCE == "schedule"'
+    - if: '$CI_JOB_STAGE =~ "normal" && $CI_PIPELINE_SOURCE == "schedule"'
       when: never
     - when: always
   artifacts:
@@ -211,7 +211,6 @@ default:
 
 stages:
   - build-images
-#  - fast
   - normal
   - platform-images
   - platforms
@@ -225,26 +224,12 @@ build-image-inotify:
   variables:
     target: emacs-inotify
 
-# test-fast-inotify:
-#   stage: fast
-#   extends: [.job-template, .test-template]
-#   variables:
-#     target: emacs-inotify
-#     make_params: "-C test check"
-
-test-lisp-inotify:
-  stage: normal
-  extends: [.job-template, .test-template]
-  variables:
-    target: emacs-inotify
-    make_params: "-C test check-lisp"
-
-test-lisp-net-inotify:
+test-inotify:
   stage: normal
   extends: [.job-template, .test-template]
   variables:
     target: emacs-inotify
-    make_params: "-C test check-lisp-net"
+    make_params: "-C test check"
 
 build-image-filenotify-gio:
   stage: platform-images
diff --git a/test/lisp/progmodes/elisp-mode-tests.el b/test/lisp/progmodes/elisp-mode-tests.el
index 8a3669c427..7d17f6a167 100644
--- a/test/lisp/progmodes/elisp-mode-tests.el
+++ b/test/lisp/progmodes/elisp-mode-tests.el
@@ -782,11 +782,11 @@ find-defs-minor-defvar-c
    ))
 
 (xref-elisp-deftest find-defs-defvar-el
-  (elisp--xref-find-definitions 'xref--marker-ring)
+  (elisp--xref-find-definitions 'xref-marker-ring-length)
   (list
-   (xref-make "(defvar xref--marker-ring)"
+   (xref-make "(defvar xref-marker-ring-length)"
 	      (xref-make-elisp-location
-	       'xref--marker-ring 'defvar
+	       'xref-marker-ring-length 'defvar
 	       (expand-file-name "../../../lisp/progmodes/xref.el" emacs-test-dir)))
     ))
 
-- 
2.26.2