Further Tramp instrumentation

; * test/infra/test-jobs.yml (test-lisp-net-inotify):
; Revert instrumentation.

diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c123b2eac1838d3211a222fdb1960c80dc9af94d..0bfb770f5ed41b7153246d3ad1bbbe8cef84bc66 100644 (file)
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4865,8 +4865,11 @@ support symbolic links."
         (error-file
          (and error-buffer
               (with-parsed-tramp-file-name default-directory nil
-                (tramp-make-tramp-file-name
-                 v (tramp-make-tramp-temp-file v)))))
+                (tramp-test-message "Holla1")
+                (prog1
+                    (tramp-make-tramp-file-name
+                     v (tramp-make-tramp-temp-file v))
+                (tramp-test-message "Holla2")))))
         (bname (buffer-name output-buffer))
         (p (get-buffer-process output-buffer))
         (dir default-directory)
@@ -4939,25 +4942,27 @@ support symbolic links."
                       (buffer-name output-buffer) buffer command))
            ;; Insert error messages if they were separated.
            (when error-file
+             (tramp-test-message "Holla3")
              (with-current-buffer error-buffer
-               (insert-file-contents-literally error-file)))
+               (insert-file-contents-literally error-file))
+             (tramp-test-message "Holla4"))
            (if (process-live-p p)
-             ;; Display output.
-             (with-current-buffer output-buffer
-               (setq mode-line-process '(":%s"))
-               (unless (eq major-mode 'shell-mode)
-                 (shell-mode))
-               (set-process-filter p #'comint-output-filter)
-               (set-process-sentinel p #'shell-command-sentinel)
-               (when error-file
-                 (add-function
-                  :after (process-sentinel p)
-                  (lambda (_proc _string)
-                    (with-current-buffer error-buffer
-                      (insert-file-contents-literally
-                       error-file nil nil nil 'replace))
-                    (delete-file error-file))))
-               (display-buffer output-buffer '(nil (allow-no-window . t))))
+               ;; Display output.
+               (with-current-buffer output-buffer
+                 (setq mode-line-process '(":%s"))
+                 (unless (eq major-mode 'shell-mode)
+                   (shell-mode))
+                 (set-process-filter p #'comint-output-filter)
+                 (set-process-sentinel p #'shell-command-sentinel)
+                 (when error-file
+                   (add-function
+                    :after (process-sentinel p)
+                    (lambda (_proc _string)
+                      (with-current-buffer error-buffer
+                        (insert-file-contents-literally
+                         error-file nil nil nil 'replace))
+                      (delete-file error-file))))
+                 (display-buffer output-buffer '(nil (allow-no-window . t))))
 
              (when error-file
                (delete-file error-file)))))

diff --git a/test/infra/test-jobs.yml b/test/infra/test-jobs.yml
index c18a3ca0d9cff3107632f59628415135e563ae7d..51707c181b123551ac07f1cf9082a7a23283f0b6 100644 (file)
--- a/test/infra/test-jobs.yml
+++ b/test/infra/test-jobs.yml
@@ -338,7 +338,7 @@ test-lisp-net-inotify:
         - test/lisp/net/*resources/**
   variables:
     target: emacs-inotify
-    make_params: "-k -C test check-lisp-net SELECTOR='(not (tag :unstable))'"
+    make_params: "-k -C test check-lisp-net"
 
 test-lisp-nxml-inotify:
   stage: normal

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index b064e3f5d0e28c0f2ba0b9ac7af02045f7a6df4e..9f88b5d5d36a3c8e7c4deccce2ff6ef0b4f0c02d 100644 (file)
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -5349,7 +5349,7 @@ INPUT, if non-nil, is a string sent to the process."
 
 (ert-deftest tramp-test32-shell-command ()
   "Check `shell-command'."
-  :tags '(:expensive-test)
+  :tags (unless (getenv "EMACS_EMBA_CI") '(:expensive-test))
   (skip-unless (tramp--test-enabled))
   (skip-unless (tramp--test-supports-processes-p))
   ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for