[Boost-commit] svn:boost r44970 - trunk/tools/build/v2/test

From: jurko.gospodnetic_at_[hidden]
Date: 2008-05-01 05:55:48

Author: jurko
Date: 2008-05-01 05:55:47 EDT (Thu, 01 May 2008)
New Revision: 44970
URL: http://svn.boost.org/trac/boost/changeset/44970

Log:
Renamed the Tester.wait_for_time_change() function to Tester.wait_for_time_change_since_last_build() to avoid confusion.
Text files modified: 
   trunk/tools/build/v2/test/BoostBuild.py |    13 +++++++------                           
   trunk/tools/build/v2/test/rebuilds.py   |     2 +-                                      
   2 files changed, 8 insertions(+), 7 deletions(-)

Modified: trunk/tools/build/v2/test/BoostBuild.py
==============================================================================
--- trunk/tools/build/v2/test/BoostBuild.py	(original)
+++ trunk/tools/build/v2/test/BoostBuild.py	2008-05-01 05:55:47 EDT (Thu, 01 May 2008)
@@ -285,7 +285,7 @@
         os.path.walk(".", make_writable, None)
 
     def write(self, file, content):
-        self.wait_for_time_change()
+        self.wait_for_time_change_since_last_build()
         nfile = self.native_file_name(file)
         try:
             os.makedirs(os.path.dirname(nfile))
@@ -308,7 +308,7 @@
         self.touch(new);
 
     def copy(self, src, dst):
-        self.wait_for_time_change()
+        self.wait_for_time_change_since_last_build()
         try:
             self.write(dst, self.read(src, 1))
         except:
@@ -322,12 +322,12 @@
         os.utime(dst_name, (stats.st_atime, stats.st_mtime))
 
     def touch(self, names):
-        self.wait_for_time_change()
+        self.wait_for_time_change_since_last_build()
         for name in self.adjust_names(names):
             os.utime(self.native_file_name(name), None)
 
     def rm(self, names):
-        self.wait_for_time_change()
+        self.wait_for_time_change_since_last_build()
         if not type(names) == types.ListType:
             names = [names]
 
@@ -784,8 +784,9 @@
         return os.path.normpath(apply(os.path.join, [self.workdir]+elements))
 
     # Wait while time is no longer equal to the time last "run_build_system"
-    # call finished.
-    def wait_for_time_change(self):
+    # call finished. Used to avoid subsequent builds treating existing files as
+    # 'current'.
+    def wait_for_time_change_since_last_build(self):
         while 1:
             f = time.time();
             # In fact, I'm not sure why "+ 2" as opposed to "+ 1" is needed but

Modified: trunk/tools/build/v2/test/rebuilds.py
==============================================================================
--- trunk/tools/build/v2/test/rebuilds.py	(original)
+++ trunk/tools/build/v2/test/rebuilds.py	2008-05-01 05:55:47 EDT (Thu, 01 May 2008)
@@ -35,7 +35,7 @@
 t.expect_addition('bar')
 t.expect_nothing_more()
 
-t.wait_for_time_change()
+t.wait_for_time_change_since_last_build()
 t.run_build_system('-ffile.jam foo')
 t.expect_touch('bar')
 t.expect_addition('foo')