From: Michael Albinus <michael.albinus@gmx.de>
Date: Thu, 9 Aug 2018 13:40:37 +0000 (+0200)
Subject: ; More instrumentation for shadowfile-tests.el and files.el
X-Git-Tag: emacs-27.0.90~4621
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=53483df0de0085dbc9ef0b15a0f629ab808b0147;p=emacs.git
; More instrumentation for shadowfile-tests.el and files.el
---
diff --git a/lisp/files.el b/lisp/files.el
index 8057def5259..940bacde230 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -5091,6 +5091,9 @@ Before and after saving the buffer, this function runs
(make-directory dir t)
(error "Canceled")))
(setq setmodes (basic-save-buffer-1)))))
+ ;; We are hunting a nasty error, which happens on hydra.
+ ;; Adding traces might help.
+ (if (getenv "BUG_32226") (message "BUG_32226"))
;; Now we have saved the current buffer. Let's make sure
;; that buffer-file-coding-system is fixed to what
;; actually used for saving by binding it locally.
diff --git a/test/lisp/shadowfile-tests.el b/test/lisp/shadowfile-tests.el
index 0335caa5168..22f7b2de6ed 100644
--- a/test/lisp/shadowfile-tests.el
+++ b/test/lisp/shadowfile-tests.el
@@ -724,6 +724,8 @@ guaranteed by the originator of a cluster definition."
(dolist (elt (all-completions "shadow-" obarray 'functionp))
(trace-function-background (intern elt)))
(trace-function-background 'save-buffer)
+ (dolist (elt write-file-functions)
+ (trace-function-background elt))
;; Cleanup.
(when (file-exists-p shadow-info-file)
(delete-file shadow-info-file))
@@ -775,7 +777,10 @@ guaranteed by the originator of a cluster definition."
(message "Point 4.2")
(insert "foo")
(message "%s" buffer-file-name)
+ (message "%s" write-file-functions)
+ (setenv "BUG_32226" "1")
(save-buffer))
+ (setenv "BUG_32226")
(message "Point 4.3")
(message "%s" (shadow-site-primary cluster2))
(message "%s" (shadow-contract-file-name (concat "/cluster1:" file)))
@@ -821,6 +826,7 @@ guaranteed by the originator of a cluster definition."
shadow-files-to-copy)))
(error (message "Error: %s" err) (signal (car err) (cdr err))))
+ (setenv "BUG_32226")
(untrace-all)
(message "%s" (with-current-buffer trace-buffer (buffer-string)))