From 2eacf4b7be01bb7882b65d59fc8af0e7e507106e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Tue, 17 Mar 2026 00:33:11 +0400
Subject: [PATCH] tests/qtest: drop DBUS_VMSTATE_TEST_TMPDIR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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é <berrange@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
 tests/dbus-daemon.sh            | 2 +-
 tests/qtest/dbus-vmstate-test.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/tests/dbus-daemon.sh b/tests/dbus-daemon.sh
index 474e250154..c4a50c7377 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
diff --git a/tests/qtest/dbus-vmstate-test.c b/tests/qtest/dbus-vmstate-test.c
index 15c35e7c0f..339b731ceb 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",