aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorMichael Albinus2022-07-27 21:20:49 +0200
committerMichael Albinus2022-07-27 21:20:49 +0200
commit00897b63694069b0f2fb152fa74333c6f6418fc5 (patch)
treecc45886172c0d3d23f5faedaf16c3ba49d456c1a /test
parent4a1c7a90edcb0c5e8beed6d649472f1bef59b389 (diff)
downloademacs-00897b63694069b0f2fb152fa74333c6f6418fc5.tar.gz
emacs-00897b63694069b0f2fb152fa74333c6f6418fc5.zip
Remove Tramp instrumentation
Diffstat (limited to 'test')
-rw-r--r--test/lisp/net/tramp-tests.el15
1 files changed, 3 insertions, 12 deletions
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."
5349 5349
5350(ert-deftest tramp-test32-shell-command () 5350(ert-deftest tramp-test32-shell-command ()
5351 "Check `shell-command'." 5351 "Check `shell-command'."
5352 :tags (unless (getenv "EMACS_EMBA_CI") '(:expensive-test)) 5352 :tags '(:expensive-test)
5353 (skip-unless (tramp--test-enabled)) 5353 (skip-unless (tramp--test-enabled))
5354 (skip-unless (tramp--test-supports-processes-p)) 5354 (skip-unless (tramp--test-supports-processes-p))
5355 ;; Prior Emacs 27, `shell-file-name' was hard coded as "/bin/sh" for 5355 ;; 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."
5357 (when (tramp--test-adb-p) 5357 (when (tramp--test-adb-p)
5358 (skip-unless (tramp--test-emacs27-p))) 5358 (skip-unless (tramp--test-emacs27-p)))
5359 5359
5360 (tramp--test-instrument-test-case (if (getenv "EMACS_EMBA_CI") 10 0)
5361 (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil))) 5360 (dolist (quoted (if (tramp--test-expensive-test-p) '(nil t) '(nil)))
5362 (let ((tmp-name (tramp--test-make-temp-name nil quoted)) 5361 (let ((tmp-name (tramp--test-make-temp-name nil quoted))
5363 (default-directory ert-remote-temporary-file-directory) 5362 (default-directory ert-remote-temporary-file-directory)
@@ -5400,21 +5399,13 @@ INPUT, if non-nil, is a string sent to the process."
5400 (let ((stderr (generate-new-buffer "*stderr*"))) 5399 (let ((stderr (generate-new-buffer "*stderr*")))
5401 (unwind-protect 5400 (unwind-protect
5402 (with-temp-buffer 5401 (with-temp-buffer
5403 (when (getenv "EMACS_EMBA_CI")
5404 (tramp--test-message "Hallo1"))
5405 (funcall 5402 (funcall
5406 this-shell-command 5403 this-shell-command
5407 "echo foo >&2; echo bar" (current-buffer) stderr) 5404 "echo foo >&2; echo bar" (current-buffer) stderr)
5408 (when (getenv "EMACS_EMBA_CI")
5409 (tramp--test-message "Hallo2"))
5410 (should (string-equal "bar\n" (buffer-string))) 5405 (should (string-equal "bar\n" (buffer-string)))
5411 (when (getenv "EMACS_EMBA_CI")
5412 (tramp--test-message "Hallo3"))
5413 ;; Check stderr. 5406 ;; Check stderr.
5414 (should 5407 (should
5415 (string-equal "foo\n" (tramp-get-buffer-string stderr))) 5408 (string-equal "foo\n" (tramp-get-buffer-string stderr))))
5416 (when (getenv "EMACS_EMBA_CI")
5417 (tramp--test-message "Hallo4")))
5418 5409
5419 ;; Cleanup. 5410 ;; Cleanup.
5420 (ignore-errors (kill-buffer stderr)))))) 5411 (ignore-errors (kill-buffer stderr))))))
@@ -5454,7 +5445,7 @@ INPUT, if non-nil, is a string sent to the process."
5454 (read (tramp--test-shell-command-to-string-asynchronously 5445 (read (tramp--test-shell-command-to-string-asynchronously
5455 "tput cols"))))) 5446 "tput cols")))))
5456 (when (natnump cols) 5447 (when (natnump cols)
5457 (should (= cols async-shell-command-width))))))) 5448 (should (= cols async-shell-command-width))))))
5458 5449
5459(tramp--test-deftest-direct-async-process tramp-test32-shell-command 'unstable) 5450(tramp--test-deftest-direct-async-process tramp-test32-shell-command 'unstable)
5460 5451