From bc2756c1cb3a48d9fdcbd6d85c43fc3276fc7e96 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Fri, 16 May 2003 03:31:58 +0000 Subject: Test fixes. --- src/engine/SCons/Node/FS.py | 4 ++-- test/SideEffect.py | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 1af6032..071a1d2 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 f0eeee8..ca2dc4f 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 -- cgit v0.12