; Prefer EMACS_EMBA_CI for selecting ERC tests

* test/lisp/erc/erc-scenarios-keep-place-indicator.el
(erc-scenarios-keep-place-indicator--follow):
* test/lisp/erc/erc-stamp-tests.el (erc-echo-timestamp):
* test/lisp/erc/erc-tests.el (erc--channel-modes): Use "EMACS_EMBA_CI"
for EMBA-specific test selection instead of "CI", which is a Gitlab
"predefined" variable absent from .job-template's Docker subprocess.

3 files changed, 6 insertions, 3 deletions

diff --git a/test/lisp/erc/erc-scenarios-keep-place-indicator.el b/test/lisp/erc/erc-scenarios-keep-place-indicator.el
index cc05bf105cb..2e0babfd2ae 100644
--- a/test/lisp/erc/erc-scenarios-keep-place-indicator.el
+++ b/test/lisp/erc/erc-scenarios-keep-place-indicator.el
@@ -31,9 +31,10 @@
 ;; away, the indicator is updated if it's earlier in the buffer.
 (ert-deftest erc-scenarios-keep-place-indicator--follow ()
   :tags `(:expensive-test
-          ,@(and (getenv "CI") '(:unstable))
+          ,@(and (getenv "EMACS_EMBA_CI") '(:unstable))
           ,@(and (getenv "ERC_TESTS_GRAPHICAL") '(:erc--graphical)))
 
+  ;; ERC's tests also run in external CI that exports this variable.
   (when (getenv "CI")
     (ert-skip "Times out intermittently"))
 
diff --git a/test/lisp/erc/erc-stamp-tests.el b/test/lisp/erc/erc-stamp-tests.el
index dc3332460d0..aa5f8d949b7 100644
--- a/test/lisp/erc/erc-stamp-tests.el
+++ b/test/lisp/erc/erc-stamp-tests.el
@@ -278,7 +278,8 @@
         (kill-buffer)))))
 
 (ert-deftest erc-echo-timestamp ()
-  :tags (and (null (getenv "CI")) '(:unstable))
+  ;; Only mark :unstable when running locally.
+  :tags (and (null (getenv "CI")) (null (getenv "EMACS_EMBA_CI")) '(:unstable))
 
   (should-not erc-echo-timestamps)
   (should-not erc-stamp--last-stamp)
diff --git a/test/lisp/erc/erc-tests.el b/test/lisp/erc/erc-tests.el
index 5eb084c48ee..1b486c68584 100644
--- a/test/lisp/erc/erc-tests.el
+++ b/test/lisp/erc/erc-tests.el
@@ -930,7 +930,8 @@
       (should-not calls))))
 
 (ert-deftest erc--channel-modes ()
-  :tags (and (null (getenv "CI")) '(:unstable))
+  ;; Only mark :unstable when running locally.
+  :tags (and (null (getenv "CI")) (null (getenv "EMACS_EMBA_CI")) '(:unstable))
 
   (setq erc--isupport-params (make-hash-table)
         erc--target (erc--target-from-string "#test")