From: Simon McVittie <simon.mcvittie@collabora.co.uk>
Date: Thu, 26 Feb 2015 17:55:45 +0000 (+0000)
Subject: installed-tests: don't set DBUS_TEST_HOME which is misleading
X-Git-Tag: dbus-1.9.16~54
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03da0fefd7cca25f61144ca0b627d8b07f1fc700;p=thirdparty%2Fdbus.git

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.

Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846
---

diff --git a/test/Makefile.am b/test/Makefile.am
index 3cf1d7458..e8831daf1 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 $@