[PATCH 03/10] test: cleanup test_emacs
Dmitry Kurochkin
dmitry.kurochkin at gmail.com
Mon Jun 27 21:45:04 PDT 2011
Move auxiliary function definition and configuration from command
line to test-lib.el.
---
test/test-lib.el | 8 ++++++++
test/test-lib.sh | 9 +--------
2 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/test/test-lib.el b/test/test-lib.el
index 9439996..344a02e 100644
--- a/test/test-lib.el
+++ b/test/test-lib.el
@@ -20,6 +20,14 @@
;;
;; Authors: Dmitry Kurochkin <dmitry.kurochkin at gmail.com>
+;; avoid crazy 10-column default of --batch
+(set-frame-width (window-frame (get-buffer-window)) 80)
+
+(defun notmuch-test-wait ()
+ "Wait for process completion."
+ (while (get-buffer-process (current-buffer))
+ (sleep-for 0.1)))
+
(defun visible-buffer-string ()
"Same as `buffer-string', but excludes invisible text."
(visible-buffer-substring (point-min) (point-max)))
diff --git a/test/test-lib.sh b/test/test-lib.sh
index 3ec388c..5f61960 100755
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -852,18 +852,11 @@ fi
# --directory Ensure that the local elisp sources are found
#
# --load Force loading of notmuch.el and test-lib.el
-#
-# notmuch-test-wait Function for tests to use to wait for process completion
-#
-# set-frame-width 80 columns (avoids crazy 10-column default of --batch)
emacs \$BATCH --no-init-file --no-site-file \
--directory ../../emacs --load notmuch.el \
--directory .. --load test-lib.el \
- --eval "(defun notmuch-test-wait ()
- (while (get-buffer-process (current-buffer))
- (sleep-for 0.1)))" \
- --eval "(progn (set-frame-width (window-frame (get-buffer-window)) 80) \$@)"
+ --eval "(progn \$@)"
EOF
chmod a+x ./run_emacs
./run_emacs "$@"
--
1.7.5.4
More information about the notmuch
mailing list