From: Marc-André Lureau <[email protected]> It can rely on the location of the temporary configuration instead, so we don't have to set that environment variable on every test.
Reviewed-by: Daniel P. Berrangé <[email protected]> Signed-off-by: Marc-André Lureau <[email protected]> --- tests/qtest/dbus-vmstate-test.c | 2 -- tests/dbus-daemon.sh | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-test.c index 15c35e7c0fa..339b731ceb5 100644 --- a/tests/qtest/dbus-vmstate-test.c +++ b/tests/qtest/dbus-vmstate-test.c @@ -395,8 +395,6 @@ main(int argc, char **argv) exit(1); } - g_setenv("DBUS_VMSTATE_TEST_TMPDIR", workdir, true); - migration_test_add("/dbus-vmstate/without-list", test_dbus_vmstate_without_list); migration_test_add("/dbus-vmstate/with-list", diff --git a/tests/dbus-daemon.sh b/tests/dbus-daemon.sh index 474e2501548..c4a50c73774 100755 --- a/tests/dbus-daemon.sh +++ b/tests/dbus-daemon.sh @@ -26,7 +26,7 @@ write_config() cat > "$CONF" <<EOF <busconfig> <type>session</type> - <listen>unix:tmpdir=$DBUS_VMSTATE_TEST_TMPDIR</listen> + <listen>unix:tmpdir=$(dirname "$CONF")</listen> <policy context="default"> <!-- Holes must be punched in service configuration files for -- 2.54.0
