]> git.ipfire.org Git - thirdparty/dbus.git/commitdiff
installed-tests: don't set DBUS_TEST_HOME which is misleading
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 26 Feb 2015 17:55:45 +0000 (17:55 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 16 Apr 2015 12:06:17 +0000 (13:06 +0100)
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

test/Makefile.am

index 3cf1d74586c079d01591dad8d62cfcf265db48af..e8831daf1133894959e13774996f92e45c11990e 100644 (file)
@@ -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 $@