diff options
| -rw-r--r-- | lisp/net/dbus.el | 9 | ||||
| -rw-r--r-- | test/lisp/net/secrets-tests.el | 7 |
2 files changed, 9 insertions, 7 deletions
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el index f63ab9a15a8..2d9660d127f 100644 --- a/lisp/net/dbus.el +++ b/lisp/net/dbus.el @@ -41,9 +41,16 @@ (defvar dbus-message-type-method-return) (defvar dbus-message-type-error) (defvar dbus-message-type-signal) -(defvar dbus-debug) (defvar dbus-registered-objects-table) +;; The following symbols are defined in dbusbind.c. We need them also +;; when Emacs is compiled without D-Bus support. +(unless (boundp 'dbus-error) + (define-error 'dbus-error "D-Bus error")) + +(unless (boundp 'dbus-debug) + (defvar dbus-debug nil)) + ;; Pacify byte compiler. (eval-when-compile (require 'cl-lib)) diff --git a/test/lisp/net/secrets-tests.el b/test/lisp/net/secrets-tests.el index d0c0d6fe240..dc9c7f1004a 100644 --- a/test/lisp/net/secrets-tests.el +++ b/test/lisp/net/secrets-tests.el @@ -20,7 +20,7 @@ ;;; Code: (require 'ert) -(when (featurep 'dbusbind) (require 'secrets)) +(require 'secrets) (require 'notifications) ;; We do not want chatty messages. @@ -28,7 +28,6 @@ (ert-deftest secrets-test00-availability () "Test availability of Secret Service API." - (skip-unless (featurep 'dbusbind)) :expected-result (if secrets-enabled :passed :failed) (should secrets-enabled) (should (dbus-ping :session secrets-service)) @@ -59,7 +58,6 @@ (ert-deftest secrets-test01-sessions () "Test opening / closing a secrets session." - (skip-unless (featurep 'dbusbind)) (skip-unless secrets-enabled) (skip-unless (secrets-empty-path secrets-session-path)) @@ -85,7 +83,6 @@ (ert-deftest secrets-test02-collections () "Test creation / deletion a secrets collections." - (skip-unless (featurep 'dbusbind)) (skip-unless secrets-enabled) (skip-unless (secrets-empty-path secrets-session-path)) @@ -147,7 +144,6 @@ (ert-deftest secrets-test03-items () "Test creation / deletion a secret item." - (skip-unless (featurep 'dbusbind)) (skip-unless secrets-enabled) (skip-unless (secrets-empty-path secrets-session-path)) @@ -189,7 +185,6 @@ (ert-deftest secrets-test04-search () "Test searching of secret items." - (skip-unless (featurep 'dbusbind)) (skip-unless secrets-enabled) (skip-unless (secrets-empty-path secrets-session-path)) |