summaryrefslogtreecommitdiff
path: root/test/lisp/vc
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2018-01-17 13:41:07 -0500
committerGlenn Morris <rgm@gnu.org>2018-01-17 13:41:07 -0500
commit188a9d99b8246e756aa2701bfdc9a8db57ce64c6 (patch)
tree5d6fbc3d8451a9627dfdf73bbd274722c896d619 /test/lisp/vc
parent064395251f99eb85161ca7c8e36665e2bd0453f5 (diff)
downloademacs-188a9d99b8246e756aa2701bfdc9a8db57ce64c6.tar.gz
emacs-188a9d99b8246e756aa2701bfdc9a8db57ce64c6.tar.bz2
emacs-188a9d99b8246e756aa2701bfdc9a8db57ce64c6.zip
Add some test skip conditions
* test/lisp/vc/vc-bzr-tests.el (vc-bzr-test-bug9726) (vc-bzr-test-bug9781): Skip if bzr is faulty. * test/src/thread-tests.el: Skip if not compiled with threads.
Diffstat (limited to 'test/lisp/vc')
-rw-r--r--test/lisp/vc/vc-bzr-tests.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/lisp/vc/vc-bzr-tests.el b/test/lisp/vc/vc-bzr-tests.el
index b3fbf33df6e..6b96f3b928d 100644
--- a/test/lisp/vc/vc-bzr-tests.el
+++ b/test/lisp/vc/vc-bzr-tests.el
@@ -53,7 +53,8 @@
(insert (file-name-nondirectory ignored-dir))
(write-region nil nil (expand-file-name ".bzrignore" bzrdir)
nil 'silent))
- (call-process vc-bzr-program nil nil nil "init")
+ (skip-unless (eq 0 ; some internal bzr error
+ (call-process vc-bzr-program nil nil nil "init")))
(call-process vc-bzr-program nil nil nil "add")
(call-process vc-bzr-program nil nil nil "commit" "-m" "Commit 1")
(with-temp-buffer
@@ -84,7 +85,8 @@
process-environment)))
(unwind-protect
(progn
- (call-process vc-bzr-program nil nil nil "init")
+ (skip-unless (eq 0 ; some internal bzr error
+ (call-process vc-bzr-program nil nil nil "init")))
(make-directory subdir)
(with-temp-buffer
(insert "text")