From 4fc80b62ba8e6390019a50947daa03320c047bcd Mon Sep 17 00:00:00 2001
From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 25 Aug 2011 18:32:02 +0200
Subject: [PATCH] Issue #12333: fix test_distutils failures under Solaris and
 derivatives

---
 Lib/distutils/tests/support.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index dc0e660e695..44fcd6b7d84 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -54,9 +54,13 @@ class TempdirManager(object):
 
     def setUp(self):
         super().setUp()
+        self.old_cwd = os.getcwd()
         self.tempdirs = []
 
     def tearDown(self):
+        # Restore working dir, for Solaris and derivatives, where rmdir()
+        # on the current directory fails.
+        os.chdir(self.old_cwd)
         super().tearDown()
         while self.tempdirs:
             d = self.tempdirs.pop()