From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Fri, 16 May 2003 03:31:58 +0000 (+0000)
Subject: Test fixes.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c819c3327d4281fe19ebf8ee4bbf6e2898324a81;p=scons.git

Test fixes.


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

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 1af60325..071a1d29 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -236,12 +236,12 @@ class EntryProxy(SCons.Util.Proxy):
                                              name + "_filebase")
 
     def __get_suffix(self):
-        entry.name = self.get().name
+        name = self.get().name
         return SCons.Util.SpecialAttrWrapper(os.path.splitext(name)[1],
                                              name + "_suffix")
 
     def __get_file(self):
-        entry.name = self.get().name
+        name = self.get().name
         return SCons.Util.SpecialAttrWrapper(name, name + "_file")
 
     def __get_base_path(self):
diff --git a/test/SideEffect.py b/test/SideEffect.py
index f0eeee8e..ca2dc4f7 100644
--- a/test/SideEffect.py
+++ b/test/SideEffect.py
@@ -143,12 +143,12 @@ test.run(arguments='foo.out')
 
 test.fail_test(not os.path.exists(test.workpath('foo.out')))
 test.fail_test(not os.path.exists(test.workpath('log/foo.out')))
-test.fail_test(os.path.exists(test.workpath('log/bar.out')))
-test.fail_test(os.path.exists(test.workpath('log/blat.out')))
+test.fail_test(os.path.exists(test.workpath('log', 'bar.out')))
+test.fail_test(os.path.exists(test.workpath('log', 'blat.out')))
 
 test.run(arguments='log')
-test.fail_test(not os.path.exists(test.workpath('log/bar.out')))
-test.fail_test(not os.path.exists(test.workpath('log/blat.out')))
+test.fail_test(not os.path.exists(test.workpath('log', 'bar.out')))
+test.fail_test(not os.path.exists(test.workpath('log', 'blat.out')))
 
 test.write('SConstruct', 
 """
@@ -177,12 +177,15 @@ env.SideEffect('log.txt', ['foo.out', 'bar.out', 'blat.out'])
 test.write('foo.in', 'foo.in\n')
 test.write('bar.in', 'bar.in\n')
 
-test.run(arguments = 'build/foo.out build/bar.out')
+build_foo_out = os.path.join('build', 'foo.out')
+build_bar_out = os.path.join('build', 'bar.out')
+
+test.run(arguments = '%s %s' % (build_foo_out, build_bar_out))
 
 expect = """\
-foo.in -> build/foo.out
-bar.in -> build/bar.out
-"""
+foo.in -> %s
+bar.in -> %s
+""" % (build_foo_out, build_bar_out)
 
 assert test.read('build/log.txt') == expect