Attachment 114774 Details for Bug 89846 – [5/9] installed-tests: don't set DBUS_TEST_HOME which is misleading

[patch] [5/9] installed-tests: don't set DBUS_TEST_HOME which is misleading

0005-installed-tests-don-t-set-DBUS_TEST_HOME-which-is-mi.patch (text/plain), 1.47 KB, created by Simon McVittie on 2015-03-31 16:21:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2015-03-31 16:21:29 UTC

Size: 1.47 KB

patch

obsolete

>From 574069ce10e3bc987a6f7d4948312e6026765b2b Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Thu, 26 Feb 2015 17:55:45 +0000
>Subject: [PATCH 5/9] installed-tests: don't set DBUS_TEST_HOME which is
> misleading
>
>It doesn't do anything - the variable I was thinking of is called
>DBUS_TEST_HOMEDIR. Also, if I had spelled it correctly, the tests
>would have failed, because libdbus (quite reasonably) won't create
>a nonexistent $HOME to write out cookie_sha1 files in ~/.dbus_keyrings.
>---
> test/Makefile.am | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/test/Makefile.am b/test/Makefile.am
>index 3cf1d74..e8831da 100644
>--- a/test/Makefile.am
>+++ b/test/Makefile.am
>@@ -474,7 +474,7 @@ $(installable_test_meta): %.test: %$(EXEEXT) Makefile
> 		echo '[Test]'; \
> 		echo 'Type=session'; \
> 		echo 'Output=TAP'; \
>-		echo 'Exec=env DBUS_TEST_HOME=$$(pwd)/home.tmp $(testexecdir)/$* --tap'; \
>+		echo 'Exec=env $(testexecdir)/$* --tap'; \
> 	) > $@.tmp && mv $@.tmp $@
> 
> $(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile
>@@ -482,5 +482,5 @@ $(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile
> 		echo '[Test]'; \
> 		echo 'Type=session'; \
> 		echo 'Output=TAP'; \
>-		echo 'Exec=env DBUS_TEST_HOME=$$(pwd)/home.tmp DBUS_TEST_DATA=$(testexecdir)/data $(testexecdir)/$* --tap'; \
>+		echo 'Exec=env DBUS_TEST_DATA=$(testexecdir)/data $(testexecdir)/$* --tap'; \
> 	) > $@.tmp && mv $@.tmp $@
>-- 
>2.1.4
>

Actions: View | Splinter Review

Attachments on bug 89846: 114770 | 114771 | 114772 | 114773 | 114774 | 114775 | 114776 | 114777 | 114778

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.