[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master a0e3f71: Skip emacsclient tests if --enable-profili
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master a0e3f71: Skip emacsclient tests if --enable-profiling was used |
Date: |
Wed, 6 Sep 2017 20:07:53 -0400 (EDT) |
branch: master
commit a0e3f715fc4882518fa737318c4d07ef7870bd90
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Skip emacsclient tests if --enable-profiling was used
* test/lib-src/emacsclient-tests.el
(emacsclient-test-call-emacsclient): Make it a macro.
Handle "Profiling timer expired" return from emacsclient. (Bug#28319)
(emacsclient-test-alternate-editor-allows-arguments)
(emacsclient-test-alternate-editor-allows-quotes): Update for above.
---
test/lib-src/emacsclient-tests.el | 35 +++++++++++++++++++----------------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/test/lib-src/emacsclient-tests.el
b/test/lib-src/emacsclient-tests.el
index 3a2396f..4b7fa47 100644
--- a/test/lib-src/emacsclient-tests.el
+++ b/test/lib-src/emacsclient-tests.el
@@ -31,26 +31,29 @@
"emacsclient")
"The emacsclient binary to test.")
-(defun emacsclient-test-call-emacsclient ()
- "Run emacsclient."
- (call-process emacsclient-test-emacs nil nil nil
- "--server-file" (expand-file-name "non-existent-file"
invocation-directory)
- "foo"))
+(defmacro emacsclient-test-call-emacsclient (editor)
+ "Run emacsclient with ALTERNATE_EDITOR set to EDITOR."
+ `(let* ((process-environment
+ (cons (concat "ALTERNATE_EDITOR=" ,editor) process-environment))
+ (stat (call-process emacsclient-test-emacs nil nil nil
+ "--server-file"
+ (expand-file-name "non-existent-file"
+ invocation-directory)
+ "foo")))
+ ;; Skip if emacsclient was compiled with -pg (bug#28319).
+ ;; Use ert--skip-unless rather than skip-unless to silence compiler.
+ (ert--skip-unless (not (and (stringp stat)
+ (string-match-p "rofiling" stat))))
+ (should (eq 0 stat))))
(ert-deftest emacsclient-test-alternate-editor-allows-arguments ()
- (let ((process-environment process-environment))
- (setenv "ALTERNATE_EDITOR" (concat
- (expand-file-name invocation-name
invocation-directory)
- " --batch"))
- (should (eq 0 (emacsclient-test-call-emacsclient)))))
+ (emacsclient-test-call-emacsclient
+ (concat (expand-file-name invocation-name invocation-directory) "
--batch")))
(ert-deftest emacsclient-test-alternate-editor-allows-quotes ()
- (let ((process-environment process-environment))
- (setenv "ALTERNATE_EDITOR" (concat
- "\""
- (expand-file-name invocation-name
invocation-directory)
- "\"" " --batch"))
- (should (eq 0 (emacsclient-test-call-emacsclient)))))
+ (emacsclient-test-call-emacsclient
+ (concat "\"" (expand-file-name invocation-name invocation-directory)
+ "\"" " --batch")))
(provide 'emacsclient-tests)
;;; emacsclient-tests.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master a0e3f71: Skip emacsclient tests if --enable-profiling was used,
Glenn Morris <=