From: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue, 15 Oct 2024 22:18:13 +0000 (-0700)
Subject: test: fix cleanup_test_socket_tempdir on Solaris
X-Git-Tag: dbus-1.15.12~7^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66170cbb211cdc7c022f668289452e61af205ec2;p=thirdparty%2Fdbus.git

test: fix cleanup_test_socket_tempdir on Solaris

Solaris does not allow rmdir() to remove the cwd, so chdir() out of
the tempdir before removing it.

Without this fix, misc-internal reported a failure on Solaris 11.4:
not ok 16 - failed to remove test socket directory /tmp/dbus-test-tduvWc

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---

diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c
index 1b26e34c8..6daa97c35 100644
--- a/test/internals/misc-internals.c
+++ b/test/internals/misc-internals.c
@@ -726,6 +726,8 @@ static char test_socket_dir[] = DBUS_TEST_SOCKET_DIR "/dbus-test-XXXXXX";
 static void
 cleanup_test_socket_tempdir (void)
 {
+  if (chdir ("/tmp") != 0)
+    _dbus_test_fatal ("Failed to chdir() to /tmp");
   if (rmdir (test_socket_dir) != 0)
     _dbus_test_not_ok ("failed to remove test socket directory %s",
                        test_socket_dir);