From 5ab91020fbc2f3bf75aa732a7456d9119ccbc347 Mon Sep 17 00:00:00 2001
From: Glenn Morris <rgm@gnu.org>
Date: Tue, 18 Jul 2017 12:53:46 -0400
Subject: [PATCH] Use a more specific test for running on hydra.nixos.org

* lisp/emacs-lisp/ert.el (ert-summarize-tests-batch-and-exit):
* test/Makefile.in (WRITE_LOG):
* test/lisp/filenotify-tests.el:
* test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
(eieio-test-method-order-list-6):
* test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
(eieio-test-37-obsolete-name-in-constructor):
* test/lisp/net/tramp-tests.el: Replace NIX_STORE with EMACS_HYDRA_CI.
---
 lisp/emacs-lisp/ert.el                                      | 2 +-
 test/Makefile.in                                            | 2 +-
 test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el | 2 +-
 test/lisp/emacs-lisp/eieio-tests/eieio-tests.el             | 2 +-
 test/lisp/filenotify-tests.el                               | 4 ++--
 test/lisp/net/tramp-tests.el                                | 6 +++---
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index eb2b2e3e11b..cee225cc8e0 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -1512,7 +1512,7 @@ Ran \\([0-9]+\\) tests, \\([0-9]+\\) results as expected\
       (message "%d files contained unexpected results:" (length unexpected))
       (mapc (lambda (l) (message "  %s" l)) unexpected))
     ;; More details on hydra, where the logs are harder to get to.
-    (when (and (getenv "NIX_STORE")
+    (when (and (getenv "EMACS_HYDRA_CI")
                (not (zerop (+ nunexpected nskipped))))
       (message "\nDETAILS")
       (message "-------")
diff --git a/test/Makefile.in b/test/Makefile.in
index 4e1a120d5c2..ba823ec7e32 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -136,7 +136,7 @@ endif
 	$(AM_V_ELC)$(emacs) -f batch-byte-compile $<
 
 ## Save logs, and show logs for failed tests.
-WRITE_LOG = $(if $(and ${NIX_STORE}, $(findstring tramp, $@)), |& tee $@, > $@ 2>&1) \
+WRITE_LOG = $(if $(and ${EMACS_HYDRA_CI}, $(findstring tramp, $@)), |& tee $@, > $@ 2>&1) \
 		|| { STAT=$$?; cat $@; exit $$STAT; }
 
 ifeq ($(TEST_LOAD_EL), yes)
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
index 241ca65122d..3df2157cc83 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-test-methodinvoke.el
@@ -192,7 +192,7 @@
 (ert-deftest eieio-test-method-order-list-6 ()
   ;; FIXME repeated intermittent failures on hydra (bug#24503)
   ;; ((:STATIC C) (:STATIC C-base1) (:STATIC C-base2)) != ((:STATIC C))")
-  (skip-unless (not (getenv "NIX_STORE")))
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
   (let ((eieio-test-method-order-list nil)
 	(ans '(
 	       (:STATIC C)
diff --git a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
index c34560ab585..1a6ab9da085 100644
--- a/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
+++ b/test/lisp/emacs-lisp/eieio-tests/eieio-tests.el
@@ -894,7 +894,7 @@ Subclasses to override slot attributes.")
 
 (ert-deftest eieio-test-37-obsolete-name-in-constructor ()
   ;; FIXME repeated intermittent failures on hydra (bug#24503)
-  (skip-unless (not (getenv "NIX_STORE")))
+  (skip-unless (not (getenv "EMACS_HYDRA_CI")))
   (should (equal (eieio--testing "toto") '("toto" 2))))
 
 (ert-deftest eieio-autoload ()
diff --git a/test/lisp/filenotify-tests.el b/test/lisp/filenotify-tests.el
index 8d05ceacee2..3456d31fda9 100644
--- a/test/lisp/filenotify-tests.el
+++ b/test/lisp/filenotify-tests.el
@@ -173,8 +173,8 @@ Return nil when any other file notification watch is still active."
       tramp-verbose 0
       tramp-message-show-message nil)
 
-;; This shall happen on hydra only.
-(when (getenv "NIX_STORE")
+;; This should happen on hydra only.
+(when (getenv "EMACS_HYDRA_CI")
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
 ;; We do not want to try and fail `file-notify-add-watch'.
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index de4fc8e0513..94e91b79300 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -86,8 +86,8 @@
       tramp-message-show-message nil
       tramp-persistency-file-name nil)
 
-;; This shall happen on hydra only.
-(when (getenv "NIX_STORE")
+;; This should happen on hydra only.
+(when (getenv "EMACS_HYDRA_CI")
   (add-to-list 'tramp-remote-path 'tramp-own-remote-path))
 
 (defvar tramp--test-expensive-test
@@ -3706,7 +3706,7 @@ process sentinels.  They shall not disturb each other."
            ;; On hydra, timings are bad.
            (timer-repeat
             (cond
-             ((getenv "NIX_STORE") 10)
+             ((getenv "EMACS_HYDRA_CI") 10)
              (t 1)))
            ;; We must distinguish due to performance reasons.
            (timer-operation
-- 
2.39.2