Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r79597 - trunk/tools/build/v2/test
From: jurko.gospodnetic_at_[hidden]
Date: 2012-07-19 06:16:42


Author: jurko
Date: 2012-07-19 06:16:41 EDT (Thu, 19 Jul 2012)
New Revision: 79597
URL: http://svn.boost.org/trac/boost/changeset/79597

Log:
Corrected internal Boost Build testing framework bug causing it to report detected filesystem changes from a previous instead of the failed test run when the failure was caused by an unexpected exit code, unexpected stderr content, unexpected stdout content or exceeded maximal test duration.
Text files modified:
   trunk/tools/build/v2/test/BoostBuild.py | 24 ++++++++++++------------
   1 files changed, 12 insertions(+), 12 deletions(-)

Modified: trunk/tools/build/v2/test/BoostBuild.py
==============================================================================
--- trunk/tools/build/v2/test/BoostBuild.py (original)
+++ trunk/tools/build/v2/test/BoostBuild.py 2012-07-19 06:16:41 EDT (Thu, 19 Jul 2012)
@@ -473,6 +473,18 @@
             old_last_build_timestamp = self.last_build_timestamp
             self.last_build_timestamp = self.__get_current_file_timestamp()
 
+ self.tree = tree.build_tree(self.workdir)
+ self.difference = tree.trees_difference(self.previous_tree, self.tree)
+ if self.difference.empty():
+ # If nothing has been changed by this build and sufficient time has
+ # passed since the last build that actually changed something,
+ # there is no need to wait for touched or newly created files to
+ # start getting newer timestamps than the currently existing ones.
+ self.last_build_timestamp = old_last_build_timestamp
+
+ self.difference.ignore_directories()
+ self.unexpected_difference = copy.deepcopy(self.difference)
+
         if (status and self.status) is not None and self.status != status:
             expect = ''
             if status != 0:
@@ -514,18 +526,6 @@
                     expected_duration))
                 self.fail_test(1, dump_stdio=False)
 
- self.tree = tree.build_tree(self.workdir)
- self.difference = tree.trees_difference(self.previous_tree, self.tree)
- if self.difference.empty():
- # If nothing has been changed by this build and sufficient time has
- # passed since the last build that actually changed something,
- # there is no need to wait for touched or newly created files to
- # start getting newer timestamps than the currently existing ones.
- self.last_build_timestamp = old_last_build_timestamp
-
- self.difference.ignore_directories()
- self.unexpected_difference = copy.deepcopy(self.difference)
-
     def glob_file(self, name):
         result = None
         if hasattr(self, 'difference'):


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk