From 00897b63694069b0f2fb152fa74333c6f6418fc5 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Wed, 27 Jul 2022 21:20:49 +0200 Subject: [PATCH] Remove Tramp instrumentation --- lisp/net/tramp.el | 31 +++++++++---------------------- test/lisp/net/tramp-tests.el | 15 +++------------ 2 files changed, 12 insertions(+), 34 deletions(-) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index e1a45e4ad54..faf3182d4aa 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4865,13 +4865,8 @@ support symbolic links." (error-file (and error-buffer (with-parsed-tramp-file-name default-directory nil - (when (getenv "EMACS_EMBA_CI") - (tramp-test-message "Holla1")) - (prog1 - (tramp-make-tramp-file-name - v (tramp-make-tramp-temp-file v)) - (when (getenv "EMACS_EMBA_CI") - (tramp-test-message "Holla2")))))) + (tramp-make-tramp-file-name + v (tramp-make-tramp-temp-file v))))) (bname (buffer-name output-buffer)) (p (get-buffer-process output-buffer)) (dir default-directory) @@ -4954,25 +4949,17 @@ support symbolic links." (add-function :after (process-sentinel p) (lambda (_proc _string) - (when (getenv "EMACS_EMBA_CI") - (tramp-test-message "Holla3 %s" error-file)) (with-current-buffer error-buffer (insert-file-contents-literally error-file nil nil nil 'replace)) - (when (getenv "EMACS_EMBA_CI") - (tramp-test-message "Holla4 %s" error-file)) (delete-file error-file)))) - (display-buffer output-buffer '(nil (allow-no-window . t)))) - - ;; Insert error messages if they were separated. - (when (and error-file (not (process-live-p p))) - (when (getenv "EMACS_EMBA_CI") - (tramp-test-message "Holla5 %s" error-file)) - (with-current-buffer error-buffer - (insert-file-contents-literally error-file)) - (when (getenv "EMACS_EMBA_CI") - (tramp-test-message "Holla6 %s" error-file)) - (delete-file error-file))))) + (display-buffer output-buffer '(nil (allow-no-window . t))))) + + ;; Insert error messages if they were separated. + (when (and error-file (not (process-live-p p))) + (with-current-buffer error-buffer + (insert-file-contents-literally error-file)) + (delete-file error-file)))) ;; Synchronous case. (prog1 diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 9f88b5d5d36..5a8d9100e18 100644 --- 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 (unless (getenv "EMACS_EMBA_CI") '(:expensive-test)) + :tags '(: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 @@ -5357,7 +5357,6 @@ INPUT, if non-nil, is a string sent to the process." (when (tramp--test-adb-p) (skip-unless (tramp--test-emacs27-p))) - (tramp--test-instrument-test-case (if (getenv "EMACS_EMBA_CI") 10 0) (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil))) (let ((tmp-name (tramp--test-make-temp-name nil quoted)) (default-directory ert-remote-temporary-file-directory) @@ -5400,21 +5399,13 @@ INPUT, if non-nil, is a string sent to the process." (let ((stderr (generate-new-buffer "*stderr*"))) (unwind-protect (with-temp-buffer - (when (getenv "EMACS_EMBA_CI") - (tramp--test-message "Hallo1")) (funcall this-shell-command "echo foo >&2; echo bar" (current-buffer) stderr) - (when (getenv "EMACS_EMBA_CI") - (tramp--test-message "Hallo2")) (should (string-equal "bar\n" (buffer-string))) - (when (getenv "EMACS_EMBA_CI") - (tramp--test-message "Hallo3")) ;; Check stderr. (should - (string-equal "foo\n" (tramp-get-buffer-string stderr))) - (when (getenv "EMACS_EMBA_CI") - (tramp--test-message "Hallo4"))) + (string-equal "foo\n" (tramp-get-buffer-string stderr)))) ;; Cleanup. (ignore-errors (kill-buffer stderr)))))) @@ -5454,7 +5445,7 @@ INPUT, if non-nil, is a string sent to the process." (read (tramp--test-shell-command-to-string-asynchronously "tput cols"))))) (when (natnump cols) - (should (= cols async-shell-command-width))))))) + (should (= cols async-shell-command-width)))))) (tramp--test-deftest-direct-async-process tramp-test32-shell-command 'unstable) -- 2.39.2