Merge tag 'upstream/2.5.0+repack'

Upstream version 2.5.0+repack

1 files changed, 12 insertions, 5 deletions

diff --git a/src/engine/SCons/CacheDirTests.py b/src/engine/SCons/CacheDirTests.py
index 9855055..68f3579 100644
--- a/src/engine/SCons/CacheDirTests.py
+++ b/src/engine/SCons/CacheDirTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 
-__revision__ = "src/engine/SCons/CacheDirTests.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "src/engine/SCons/CacheDirTests.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
 
 import os.path
 import shutil
@@ -83,6 +83,11 @@ class BaseTestCase(unittest.TestCase):
             #node.binfo.ninfo.bsig = bsig
         return node
 
+    def tearDown(self):
+        os.remove(os.path.join(self._CacheDir.path, 'config'))
+        os.rmdir(self._CacheDir.path)
+        # Should that be shutil.rmtree?
+
 class CacheDirTestCase(BaseTestCase):
     """
     Test calling CacheDir code directly.
@@ -98,10 +103,12 @@ class CacheDirTestCase(BaseTestCase):
         SCons.Util.MD5collect = my_collect
 
         try:
-            f5 = self.File("cd.f5", 'a_fake_bsig')
+            name = 'a_fake_bsig'
+            f5 = self.File("cd.f5", name)
             result = self._CacheDir.cachepath(f5)
-            dirname = os.path.join('cache', 'A')
-            filename = os.path.join(dirname, 'a_fake_bsig')
+            len = self._CacheDir.config['prefix_len']
+            dirname = os.path.join('cache', name.upper()[:len])
+            filename = os.path.join(dirname, name)
             assert result == (dirname, filename), result
         finally:
             SCons.Util.MD5collect = save_collect