Update of /cvsroot/boost/boost/tools/build/v2/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv3318
Modified Files:
Tag: RC_1_34_0
BoostBuild.py notfile.py rebuilds.py
Log Message:
Index: BoostBuild.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/BoostBuild.py,v
retrieving revision 1.71.2.4
retrieving revision 1.71.2.5
diff -u -d -r1.71.2.4 -r1.71.2.5
--- BoostBuild.py 5 Nov 2006 00:56:27 -0000 1.71.2.4
+++ BoostBuild.py 8 Nov 2006 09:01:09 -0000 1.71.2.5
@@ -522,7 +522,22 @@
print 'FAILED'
print '------- The following changes were unexpected ------- '
self.unexpected_difference.pprint()
- self.fail_test(1)
+ self.fail_test(1)
+
+ def expect_output_line(self, expected):
+ expected = expected.strip()
+ lines = self.stdout().splitlines()
+ found = 0
+ for line in lines:
+ line = line.strip()
+ if fnmatch.fnmatch(line, expected):
+ found = 1
+ break
+
+ if not found:
+ print "Did not found expected line in output:"
+ print expected
+ self.fail_test(1)
def expect_content(self, name, content, exact=0):
name = self.adjust_names(name)[0]
@@ -536,20 +551,22 @@
self.fail_test(1)
content = string.replace(content, "$toolset", self.toolset+"*")
-
+
+ matched = 0
if exact:
matched = fnmatch.fnmatch(actual,content)
else:
actual_ = map(lambda x: sorted(x.split()),actual.splitlines())
content_ = map(lambda x: sorted(x.split()),content.splitlines())
- matched = map(
- lambda x,y: map(lambda n,p: fnmatch.fnmatch(n,p),x,y),
- actual_, content_ )
- matched = reduce(
- lambda x,y: x and reduce(
- lambda a,b: a and b,
+ if len(actual_) == len(content_):
+ matched = map(
+ lambda x,y: map(lambda n,p: fnmatch.fnmatch(n,p),x,y),
+ actual_, content_ )
+ matched = reduce(
+ lambda x,y: x and reduce(
+ lambda a,b: a and b,
y ),
- matched )
+ matched )
if not matched:
print "Expected:\n"
Index: notfile.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/notfile.py,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -d -r1.1 -r1.1.6.1
--- notfile.py 16 Jun 2005 08:24:01 -0000 1.1
+++ notfile.py 8 Nov 2006 09:01:09 -0000 1.1.6.1
@@ -10,6 +10,7 @@
from BoostBuild import Tester, List
import string
import os
+import fnmatch
t = Tester()
@@ -48,7 +49,7 @@
name = t.adjust_names(["bin/$toolset/debug/hello.exe"])[0]
name = apply(os.path.join, string.split(name, "/"));
c = "valgrind " + name
-t.fail_test(string.find(t.stdout(), c) == -1)
+t.expect_output_line(c)
t.cleanup()
Index: rebuilds.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/rebuilds.py,v
retrieving revision 1.1.6.1
retrieving revision 1.1.6.2
diff -u -d -r1.1.6.1 -r1.1.6.2
--- rebuilds.py 5 Nov 2006 18:28:24 -0000 1.1.6.1
+++ rebuilds.py 8 Nov 2006 09:01:09 -0000 1.1.6.2
@@ -19,7 +19,7 @@
actions make
{
echo "******" making $(<) from $(>) "******"
- echo made from $(>) >> $(<)
+ echo made from $(>) > $(<)
}
make aux1 : bar ;
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Boost-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/boost-cvs
