diff options
| author | Michael Albinus | 2016-05-11 16:45:39 +0200 |
|---|---|---|
| committer | Michael Albinus | 2016-05-11 16:45:39 +0200 |
| commit | 4c7f32977c4fad322a80e33a2e397aa8496ed9ba (patch) | |
| tree | dd0b0a6956ab6a3c95c7ae930060bd3ddf8354e2 | |
| parent | 51c816b9aaff3d4c3b130d35d2ed7827c3e6e5fc (diff) | |
| download | emacs-4c7f32977c4fad322a80e33a2e397aa8496ed9ba.tar.gz emacs-4c7f32977c4fad322a80e33a2e397aa8496ed9ba.zip | |
; Remove instrumentation of tramp-tests.el
| -rw-r--r-- | test/lisp/net/tramp-tests.el | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 2238da501b0..6553421c5bc 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el | |||
| @@ -639,34 +639,24 @@ This checks also `file-name-as-directory', `file-name-directory', | |||
| 639 | (should-not | 639 | (should-not |
| 640 | (unhandled-file-name-directory "/method:host:/path/to/file")) | 640 | (unhandled-file-name-directory "/method:host:/path/to/file")) |
| 641 | 641 | ||
| 642 | (unwind-protect | ||
| 643 | ;; Bug#10085. | 642 | ;; Bug#10085. |
| 644 | (dolist (n-e '(nil t)) | 643 | (dolist (n-e '(nil t)) |
| 645 | ;; We must clear `tramp-default-method'. On hydra, it is "ftp", | 644 | ;; We must clear `tramp-default-method'. On hydra, it is "ftp", |
| 646 | ;; which ruins the tests. | 645 | ;; which ruins the tests. |
| 647 | (let ((non-essential n-e) | 646 | (let ((non-essential n-e) |
| 648 | tramp-default-method) | 647 | tramp-default-method) |
| 649 | (when (getenv "NIX_STORE") | ||
| 650 | (dolist (elt (all-completions "tramp-" obarray 'functionp)) | ||
| 651 | (trace-function-background (intern elt)))) | ||
| 652 | (dolist (file | 648 | (dolist (file |
| 653 | `(,(file-remote-p tramp-test-temporary-file-directory 'method) | 649 | `(,(file-remote-p tramp-test-temporary-file-directory 'method) |
| 654 | ,(file-remote-p tramp-test-temporary-file-directory 'host))) | 650 | ,(file-remote-p tramp-test-temporary-file-directory 'host))) |
| 655 | (unless (zerop (length file)) | 651 | (unless (zerop (length file)) |
| 656 | (setq file (format "/%s:" file)) | 652 | (setq file (format "/%s:" file)) |
| 657 | (should (string-equal (directory-file-name file) file)) | 653 | (should (string-equal (directory-file-name file) file)) |
| 658 | (when (getenv "NIX_STORE") | ||
| 659 | (message "file %s non-essential %s tramp-completion-mode-p %s" | ||
| 660 | file non-essential (tramp-completion-mode-p))) | ||
| 661 | (should | 654 | (should |
| 662 | (string-equal | 655 | (string-equal |
| 663 | (file-name-as-directory file) | 656 | (file-name-as-directory file) |
| 664 | (if (tramp-completion-mode-p) file (concat file "./")))) | 657 | (if (tramp-completion-mode-p) file (concat file "./")))) |
| 665 | (should (string-equal (file-name-directory file) file)) | 658 | (should (string-equal (file-name-directory file) file)) |
| 666 | (should (string-equal (file-name-nondirectory file) "")))))) | 659 | (should (string-equal (file-name-nondirectory file) ""))))))) |
| 667 | (when (getenv "NIX_STORE") | ||
| 668 | (untrace-all) | ||
| 669 | (message "%s" (with-current-buffer trace-buffer (buffer-string)))))) | ||
| 670 | 660 | ||
| 671 | (ert-deftest tramp-test07-file-exists-p () | 661 | (ert-deftest tramp-test07-file-exists-p () |
| 672 | "Check `file-exist-p', `write-region' and `delete-file'." | 662 | "Check `file-exist-p', `write-region' and `delete-file'." |