Update of /cvsroot/boost/boost/tools/build/v2/test
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv14824
Modified Files:
Tag: RC_1_34_0
BoostBuild.py dll_path.py library_chain.py
Log Message:
Index: BoostBuild.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/BoostBuild.py,v
retrieving revision 1.71.2.5
retrieving revision 1.71.2.6
diff -u -d -r1.71.2.5 -r1.71.2.6
--- BoostBuild.py 8 Nov 2006 09:01:09 -0000 1.71.2.5
+++ BoostBuild.py 10 Nov 2006 07:41:29 -0000 1.71.2.6
@@ -524,9 +524,9 @@
self.unexpected_difference.pprint()
self.fail_test(1)
- def expect_output_line(self, expected):
+ def _expect_line(self, content, expected):
expected = expected.strip()
- lines = self.stdout().splitlines()
+ lines = content.splitlines()
found = 0
for line in lines:
line = line.strip()
@@ -537,19 +537,33 @@
if not found:
print "Did not found expected line in output:"
print expected
+ print "The output was:"
+ print content
self.fail_test(1)
- def expect_content(self, name, content, exact=0):
+ def expect_output_line(self, expected):
+ self._expect_line(self.stdout(), expected)
+
+ def expect_content_line(self, name, expected):
+ content = self._read_file(name)
+ self._expect_line(content, expected)
+
+ def _read_file(self, name, exact=0):
name = self.adjust_names(name)[0]
+ result = ""
try:
if exact:
- actual = self.read(name)
+ result = self.read(name)
else:
- actual = string.replace(self.read_and_strip(name), "\\", "/")
+ result = string.replace(self.read_and_strip(name), "\\", "/")
except IOError:
print "Note: could not open file", name
self.fail_test(1)
+ return result
+
+ def expect_content(self, name, content, exact=0):
+ actual = self._read_file(name, exact)
content = string.replace(content, "$toolset", self.toolset+"*")
matched = 0
Index: dll_path.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/dll_path.py,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -d -r1.2 -r1.2.6.1
--- dll_path.py 6 Dec 2004 13:59:51 -0000 1.2
+++ dll_path.py 10 Nov 2006 07:41:29 -0000 1.2.6.1
@@ -119,10 +119,9 @@
es1 = t.adjust_names(["a/bin/$toolset/debug"])[0]
es2 = t.adjust_names(["b/bin/$toolset/debug"])[0]
-content = t.read("bin/$toolset/debug/mp.pathlist")
-t.fail_test(find(content, es1) == -1)
-t.fail_test(find(content, es2) == -1)
+t.expect_content_line("bin/$toolset/debug/mp.pathlist", "*" + es1);
+t.expect_content_line("bin/$toolset/debug/mp.pathlist", "*" + es2);
t.cleanup()
Index: library_chain.py
===================================================================
RCS file: /cvsroot/boost/boost/tools/build/v2/test/library_chain.py,v
retrieving revision 1.6.2.2
retrieving revision 1.6.2.3
diff -u -d -r1.6.2.2 -r1.6.2.3
--- library_chain.py 5 Nov 2006 18:28:24 -0000 1.6.2.2
+++ library_chain.py 10 Nov 2006 07:41:29 -0000 1.6.2.3
@@ -114,6 +114,7 @@
t.write("Jamroot", "")
t.write("a/Jamfile", """
lib a : a.cpp ;
+install dist : a ;
""")
t.write("a/a.cpp", """
#if defined(_WIN32)
@@ -122,12 +123,12 @@
void a() {}
""")
t.run_build_system(subdir="a")
-t.expect_addition("a/bin/$toolset/debug/a.dll")
+t.expect_addition("a/dist/a.dll")
if (os.name == 'nt' or os.uname()[0].lower().startswith('cygwin')) and
get_toolset() != 'gcc':
- file = t.adjust_names(["a/bin/$toolset/debug/a.lib"])[0]
+ file = t.adjust_names(["a/dist/a.lib"])[0]
else:
- file = t.adjust_names(["a/bin/$toolset/debug/a.dll"])[0]
+ file = t.adjust_names(["a/dist/a.dll"])[0]
t.write("b/Jamfile", """
lib b : b.cpp ../%s ;
-------------------------------------------------------------------------
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
