Commit 1f08279e authored by Michael Albinus's avatar Michael Albinus
Browse files

; Improve tramp-tests traces

parent dde7f2d4
...@@ -136,7 +136,8 @@ endif ...@@ -136,7 +136,8 @@ endif
$(AM_V_ELC)$(emacs) -f batch-byte-compile $< $(AM_V_ELC)$(emacs) -f batch-byte-compile $<
## Save logs, and show logs for failed tests. ## Save logs, and show logs for failed tests.
WRITE_LOG = > $@ 2>&1 || { STAT=$$?; cat $@; exit $$STAT; } WRITE_LOG = $(if $(and ${NIX_STORE}, $(findstring tramp, $@)), |& tee $@, > $@ 2>&1) \
|| { STAT=$$?; cat $@; exit $$STAT; }
ifeq ($(TEST_LOAD_EL), yes) ifeq ($(TEST_LOAD_EL), yes)
testloadfile = $*.el testloadfile = $*.el
...@@ -147,8 +148,7 @@ endif ...@@ -147,8 +148,7 @@ endif
%.log: %.elc %.log: %.elc
$(AM_V_at)${MKDIR_P} $(dir $@) $(AM_V_at)${MKDIR_P} $(dir $@)
$(AM_V_GEN)HOME=/nonexistent $(emacs) -l ert -l $(testloadfile) \ $(AM_V_GEN)HOME=/nonexistent $(emacs) -l ert -l $(testloadfile) \
--eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" \ --eval "(ert-run-tests-batch-and-exit ${SELECTOR_ACTUAL})" ${WRITE_LOG}
$(if $(and ${NIX_STORE}, $(findstring tramp, $(testloadfile))), , ${WRITE_LOG})
ifeq (@HAVE_MODULES@, yes) ifeq (@HAVE_MODULES@, yes)
maybe_exclude_module_tests := maybe_exclude_module_tests :=
......
...@@ -3787,9 +3787,15 @@ process sentinels. They shall not disturb each other." ...@@ -3787,9 +3787,15 @@ process sentinels. They shall not disturb each other."
(should-not (file-attributes file)) (should-not (file-attributes file))
(should (file-attributes file))) (should (file-attributes file)))
;; Send string to process. ;; Send string to process.
(tramp--test-message
"Trace 1 action %d %s %s" count buf (current-time-string))
(process-send-string proc (format "%s\n" (buffer-name buf))) (process-send-string proc (format "%s\n" (buffer-name buf)))
(tramp--test-message
"Trace 2 action %d %s %s" count buf (current-time-string))
(accept-process-output proc 0.1 nil 0) (accept-process-output proc 0.1 nil 0)
;; Regular operation. ;; Regular operation.
(tramp--test-message
"Trace 3 action %d %s %s" count buf (current-time-string))
(if (= count 2) (if (= count 2)
(should-not (file-attributes file)) (should-not (file-attributes file))
(should (file-attributes file))) (should (file-attributes file)))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment