summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2015-02-26 17:55:45 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2015-04-16 13:06:17 +0100
commit03da0fefd7cca25f61144ca0b627d8b07f1fc700 (patch)
tree0774c1a9dff93e21cff115022861a737e5ada44e /test
parentd752d07a543227e9adb23ab62b21799474ea0d17 (diff)
downloaddbus-03da0fefd7cca25f61144ca0b627d8b07f1fc700.tar.gz
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
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 3cf1d745..e8831daf 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 $@