Submitted upstream: https://gitlab.com/weinholt/ac-d-bus/-/merge_requests/3

diff --git a/tests/test-signature.sps b/tests/test-signature.sps
index 278401b..cc5574f 100755
--- a/tests/test-signature.sps
+++ b/tests/test-signature.sps
@@ -43,6 +43,7 @@
             (format-type-signature '(message BYTE BYTE BYTE BYTE UINT32 UINT32
                                              (ARRAY (STRUCT BYTE VARIANT)))))
 
+(define fail-count (test-runner-fail-count (test-runner-get)))
 (test-end)
 
-(exit (if (zero? (test-runner-fail-count (test-runner-get))) 0 1))
+(exit (if (zero? fail-count) 0 1))
diff --git a/tests/test-wire.sps b/tests/test-wire.sps
index c3354bf..06ae73b 100755
--- a/tests/test-wire.sps
+++ b/tests/test-wire.sps
@@ -147,6 +147,7 @@
                   #x08 #x01 #x67 #x00  #x00 #x00 #x00 #x00  #x05 #x01 #x75 #x00  #x04 #x00 #x00 #x00
                   #x07 #x01 #x73 #x00  #x06 #x00 #x00 #x00  #x3A #x31 #x2E #x32  #x39 #x38 #x00 #x00)))
 
+(define fail-count (test-runner-fail-count (test-runner-get)))
 (test-end)
 
-(exit (if (zero? (test-runner-fail-count (test-runner-get))) 0 1))
+(exit (if (zero? fail-count) 0 1))
refs</a><a class='active' href='/guix/log/gnu/services/vpn.scm'>log</a><a href='/guix/tree/gnu/services/vpn.scm?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>tree</a><a href='/guix/commit/gnu/services/vpn.scm?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>commit</a><a href='/guix/diff/gnu/services/vpn.scm?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/services/vpn.scm'>
<input type='hidden' name='id' value='501d10937f5b72ca2e36020b57d2e9b89b8a218e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>root</a>/<a href='/guix/log/gnu?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>gnu</a>/<a href='/guix/log/gnu/services?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>services</a>/<a href='/guix/log/gnu/services/vpn.scm?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e'>vpn.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/vpn.scm?id=501d10937f5b72ca2e36020b57d2e9b89b8a218e&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-11-18 15:05:41 +0100'>2020-11-18</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=5221df34149465c5bbc1a76f83cb09f8911279f5'>gnu: vpn: Make ca, key and cert optional.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (openvpn-client-configuration)
(openvpn-server-configuration): Make ca, key an cert fields optional.
* doc/guix.texi (VPN Services): Document the change.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-02-19 04:08:55 +0100'>2020-02-19</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=c6c447701c9cfdeedf77224399faa9c07b12d045'>gnu: services: Add openvpn options.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (openvpn-client-configuration)
(openvpn-server-configuration): Add fast-io? and auth-user-pass options.
</span></span></td><td>Julien Lepiller</td></tr>
<tr><td><span title='2020-02-19 04:08:40 +0100'>2020-02-19</span></td><td><a href='/guix/commit/gnu/services/vpn.scm?id=0372dd1a1e51e39382ee5d1aa968589b40506b8f'>gnu: services: Fix openvpn boolean fields.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/vpn.scm (serialize-boolean): Do not print #t to the file.
</span></span></td><td>Julien Lepiller</td></tr>
scm (jami-configuration): Likewise.
* gnu/services/virtualization.scm (libvirt-configuration)
(qemu-guest-agent-configuration): Likewise.
* gnu/services/vpn.scm (openvpn-client-configuration): Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2021-05-06 11:31:48 +0200'>2021-05-06</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=0d6eb69266535c1570b8b85c9e88872de34626e5'>services: dovecot: Add ‘managesieve-sieve-capability’ option.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/mail.scm (protocol-configuration): Add a
‘managesieve-sieve-capability’ field.
* doc/guix.texi (Mail Services): Document it.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Alexey Abramov</td></tr>
<tr><td><span title='2021-05-06 11:27:00 +0200'>2021-05-06</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=6e05920cef3afe0f0e3dde936a4b07a27b2c1ca3'>services: dovecot: Add ‘managesieve-notify-capability’ option.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/mail.scm (protocol-configuration): Add a
‘managesieve-notify-capability’ field.
* doc/guix.texi (Mail Services): Document it.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Alexey Abramov</td></tr>
<tr><td><span title='2021-05-06 11:08:52 +0200'>2021-05-06</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=0fd5bdcaf67ab50490e0d2fe1f954b3692aab259'>services: dovecot: Add ‘imap-metadata?’ protocol configuration option.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/mail.scm (protocol-configuration): Add an ‘imap-metadata?’
setting to enable IMAP METADATA support in the ‘imap’ protocol.
* doc/guix.texi (Mail Services): Document it.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Alexey Abramov</td></tr>
<tr><td><span title='2021-05-06 11:08:52 +0200'>2021-05-06</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=5b5c50961fc3c2c95cb97796369ec918cbff064f'>services: dovecot: Add ‘mail-attribute-dict’ configuration option.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/mail.scm (dovecot-configuration): Define a
‘mail-attribute-dict’ directive for IMAP METADATA storage.
* doc/guix.texi (Mail Services): Document it.

Signed-off-by: Tobias Geerinckx-Rice &lt;me@tobias.gr&gt;
</span></span></td><td>Alexey Abramov</td></tr>
<tr><td><span title='2021-04-06 23:59:47 +0200'>2021-04-06</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=5a6e27bfbdf04bb4555b49fd06766266807a3092'>services: dovecot: Fix serialization of a free-form-args arguments.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/mail.scm (serialize-free-form-args): Change destination and
return a string containing the formated text.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Alexey Abramov</td></tr>
<tr><td><span title='2020-12-27 19:32:09 +0100'>2020-12-27</span></td><td><a href='/guix/commit/gnu/services/mail.scm?id=b4db11364185e035de3d8c335b1a66eddeeeb84c'>services: Add radicale-service-type.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/mail.scm (radicale-configuration)
(radicale-configuration?): New procedures.
(%default-radicale-config-file)
(radicale-service-type): New variables.
* doc/guix.texi: Document it.
</span></span></td><td>Jonathan Brielmaier</td></tr>