From 7ef3bf28c05eaed128db86855183685e9d7bbd96 Mon Sep 17 00:00:00 2001
From: Gabriel Russell <gabriel.russell@mongodb.com>
Date: Tue, 3 Oct 2017 12:50:09 -0400
Subject: update mtime on cache retrieval

---
 src/engine/SCons/CacheDir.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/engine/SCons/CacheDir.py b/src/engine/SCons/CacheDir.py
index ac91c85..ab80808 100644
--- a/src/engine/SCons/CacheDir.py
+++ b/src/engine/SCons/CacheDir.py
@@ -56,6 +56,10 @@ def CacheRetrieveFunc(target, source, env):
             fs.symlink(fs.readlink(cachefile), t.get_internal_path())
         else:
             env.copy_from_cache(cachefile, t.get_internal_path())
+            try:
+                os.utime(cachefile, None)
+            except OSError:
+                pass
         st = fs.stat(cachefile)
         fs.chmod(t.get_internal_path(), stat.S_IMODE(st[stat.ST_MODE]) | stat.S_IWRITE)
     return 0
-- 
cgit v0.12


From a2e35978f159dc4f131451213c2a8c78d4b5835c Mon Sep 17 00:00:00 2001
From: Gabriel Russell <gabriel.russell@mongodb.com>
Date: Wed, 13 Dec 2017 17:03:00 -0500
Subject: test for readonly cache

---
 test/CacheDir/readonly-cache.py | 65 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100755 test/CacheDir/readonly-cache.py

diff --git a/test/CacheDir/readonly-cache.py b/test/CacheDir/readonly-cache.py
new file mode 100755
index 0000000..05c46e6
--- /dev/null
+++ b/test/CacheDir/readonly-cache.py
@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+#
+# __COPYRIGHT__
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+"""
+Verify accessing cache works even if it's read-only.
+"""
+
+import os
+import TestSCons
+
+test = TestSCons.TestSCons()
+
+test.write(['SConstruct'], """\
+CacheDir('cache')
+Command('file.out', 'file.in', Copy('$TARGET', '$SOURCE'))
+""")
+
+test.write('file.in', "file.in\n")
+
+test.run(arguments = '--debug=explain --cache-debug=- .')
+
+test.unlink('file.out')
+
+test.run(arguments = '--debug=explain --cache-debug=- .')
+
+test.unlink('file.out')
+
+for root, dirs, files in os.walk("cache",topdown=False):
+	for file in files:
+		os.chmod(os.path.join(root,file),0o444)
+	for dir in dirs:
+		os.chmod(os.path.join(root,dir),0o555)
+
+test.run(arguments = '--debug=explain --cache-debug=- .')
+
+test.pass_test()
+
+# Local Variables:
+# tab-width:4
+# indent-tabs-mode:nil
+# End:
+# vim: set expandtab tabstop=4 shiftwidth=4:
-- 
cgit v0.12


From 28d93e43689e9e91f1a648c522bf6fd11bb28f90 Mon Sep 17 00:00:00 2001
From: Gabriel Russell <gabriel.russell@mongodb.com>
Date: Tue, 30 Jan 2018 14:45:41 -0500
Subject: test for mtime update

---
 test/CacheDir/readonly-cache.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/CacheDir/readonly-cache.py b/test/CacheDir/readonly-cache.py
index 05c46e6..db3b3ec 100755
--- a/test/CacheDir/readonly-cache.py
+++ b/test/CacheDir/readonly-cache.py
@@ -28,8 +28,11 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 Verify accessing cache works even if it's read-only.
 """
 
+import glob
 import os
 import TestSCons
+import time
+from stat import *
 
 test = TestSCons.TestSCons()
 
@@ -42,10 +45,22 @@ test.write('file.in', "file.in\n")
 
 test.run(arguments = '--debug=explain --cache-debug=- .')
 
+cachefile = glob.glob("cache/??/*")[0]
+
+time0 = os.stat(cachefile).st_mtime
+
+time.sleep(.1)
+
 test.unlink('file.out')
 
 test.run(arguments = '--debug=explain --cache-debug=- .')
 
+time1  = os.stat(cachefile).st_mtime
+
+# make sure that mtime has been updated on cache use
+if time1 <= time0:
+    test.fail_test()
+
 test.unlink('file.out')
 
 for root, dirs, files in os.walk("cache",topdown=False):
-- 
cgit v0.12