From 66170cbb211cdc7c022f668289452e61af205ec2 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Tue, 15 Oct 2024 15:18:13 -0700 Subject: [PATCH] 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 --- test/internals/misc-internals.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/internals/misc-internals.c b/test/internals/misc-internals.c index 1b26e34c..6daa97c3 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);