Fix problems with two tests (one portability, one syntax).

git-svn-id: http://scons.tigris.org/svn/scons/trunk@307 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index bea14990120601ed8424befc8bf2658bbfab9a4b..98abcfc75c490fdaa1d10db7eadcfb86f1f02e6a 100644 (file)
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -398,8 +398,8 @@ class FSTestCase(unittest.TestCase):
         f2 = fs.File("f2")
         f2.scan(scn1)
         f2.scan(scn2)
-        assert f2.implicit[scn1][0].path_ == 'subdir/f2', f2.implicit[scn1][0].path_
-        assert f2.implicit[scn2][0].path_ == 'subdir/f2', f2.implicit[scn2][0].path_
+        match(f2.implicit[scn1][0].path_, 'subdir/f2')
+        match(f2.implicit[scn2][0].path_, 'subdir/f2')
 
         # Test building a file whose directory is not there yet...
         f1 = fs.File(test.workpath("foo/bar/baz/ack"))

diff --git a/test/sconsign.py b/test/sconsign.py
index a7c6971c39f632c9e76e0d1e85740bf97df9c2b8..55ec958e0b67ec04d753b2b5a1661f16a23643d9 100644 (file)
--- a/test/sconsign.py
+++ b/test/sconsign.py
@@ -33,7 +33,7 @@ test.subdir('sub1', 'sub2')
 
 test.write('SConstruct', """
 def build1(target, source, env):
-    open(str(target), 'wb').write(open(str(source[0]), 'rb').read())
+    open(str(target[0]), 'wb').write(open(str(source[0]), 'rb').read())
     return None
 
 def build2(target, source, env):