diff options
| author | Noam Postavsky | 2018-07-09 20:03:30 -0400 |
|---|---|---|
| committer | Noam Postavsky | 2018-07-09 20:03:30 -0400 |
| commit | 7bcb697e198cb314980b93862a79e892009088c4 (patch) | |
| tree | 17f30ba3b4aa4f1e4e31dde58139a5ec0ae82080 /test | |
| parent | 3307353e13a9226d477c9b1a39baae76584b90b9 (diff) | |
| parent | 65889a6d127fcbbbdc1e74d26036e91bd24d1405 (diff) | |
| download | emacs-7bcb697e198cb314980b93862a79e892009088c4.tar.gz emacs-7bcb697e198cb314980b93862a79e892009088c4.zip | |
Merge from emacs-26
65889a6d12 Fix bootstrap infloop in GNU/Linux alpha
48efd1c98b Minor fix of a recent documentation change
3302b7cd7f Mention the NSM in the gnutls variable doc strings
40c2ce743b Remove test code from last commit
e02d8e29c6 Fix Bug#32084
da5d6dbe39 Fix (length NON-SEQUENCE) documentation
Diffstat (limited to 'test')
| -rw-r--r-- | test/lisp/net/dbus-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/lisp/net/dbus-tests.el b/test/lisp/net/dbus-tests.el index 624d15ef5f1..1ada2552b85 100644 --- a/test/lisp/net/dbus-tests.el +++ b/test/lisp/net/dbus-tests.el | |||
| @@ -133,7 +133,7 @@ This includes initialization and closing the bus." | |||
| 133 | ;; Start bus. | 133 | ;; Start bus. |
| 134 | (let ((output | 134 | (let ((output |
| 135 | (ignore-errors | 135 | (ignore-errors |
| 136 | (shell-command-to-string "dbus-launch --sh-syntax"))) | 136 | (shell-command-to-string "env DISPLAY= dbus-launch --sh-syntax"))) |
| 137 | bus pid) | 137 | bus pid) |
| 138 | (skip-unless (stringp output)) | 138 | (skip-unless (stringp output)) |
| 139 | (when (string-match "DBUS_SESSION_BUS_ADDRESS='\\(.+\\)';" output) | 139 | (when (string-match "DBUS_SESSION_BUS_ADDRESS='\\(.+\\)';" output) |