Update of /cvsroot/boost/boost/tools/build/v2/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16753/tools/build/v2/test

Modified Files:
        BoostBuild.py 
Log Message:
Catch a few more Python errors while testing.

Index: BoostBuild.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/BoostBuild.py,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- BoostBuild.py       10 Nov 2006 07:40:42 -0000      1.80
+++ BoostBuild.py       30 Jul 2007 00:09:52 -0000      1.81
@@ -255,7 +255,10 @@
 
     def copy(self, src, dst):
         self.wait_for_time_change()
-        self.write(dst, self.read(src))
+        try:
+            self.write(dst, self.read(src))
+        except:
+            self.fail_test(1)
 
     def copy_preserving_timestamp(self, src, dst):
         src_name = self.native_file_name(src)
@@ -384,7 +387,11 @@
         self.last_build_time = time.time()
 
     def read(self, name):
-        return open(glob.glob(self.native_file_name(name))[0], "rb").read()
+        try:
+            return open(glob.glob(self.native_file_name(name))[0], "rb").read()
+        except:
+            self.fail_test(1)
+            return ''
 
     def read_and_strip(self, name):
         lines = open(glob.glob(self.native_file_name(name))[0], 
"rb").readlines()
@@ -556,7 +563,7 @@
                 result = self.read(name)
             else:
                 result = string.replace(self.read_and_strip(name), "\\", "/")
-        except IOError:
+        except (IOError, IndexError):
             print "Note: could not open file", name
             self.fail_test(1)
         return result
@@ -598,7 +605,7 @@
             open(a, "w").write(actual)
             print "DIFFERENCE"
             if os.system("diff -u " + e + " " + a):
-                print "Unable to compute difference"               
+                print "Unable to compute difference: diff -u %s %s" % (e,a)
             os.unlink(e)
             os.unlink(a)    
         else:


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs

Reply via email to