From 17672e58d985d0bafb7052a4d4d3d0dd1c728cc2 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Mon, 22 Sep 2008 15:38:47 +0000 Subject: Windows portability (path names in expected output). --- test/SConsignFile/make-directory.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/test/SConsignFile/make-directory.py b/test/SConsignFile/make-directory.py index 819b5e2..46f4da0 100644 --- a/test/SConsignFile/make-directory.py +++ b/test/SConsignFile/make-directory.py @@ -29,10 +29,15 @@ Verify the ability to make a SConsignFile() in a non-existent subdirectory. """ +import os + import TestSCons test = TestSCons.TestSCons() +sub_dir = os.path.join('sub', 'dir') +bar_foo_txt = os.path.join('bar', 'foo.txt') + test.write('SConstruct', """ import SCons.dblite env = Environment() @@ -42,8 +47,8 @@ env.Install('bar', 'foo.txt') test.write('foo.txt', "Foo\n") -expect = test.wrap_stdout(read_str = 'Mkdir("sub/dir")\n', - build_str = 'Install file: "foo.txt" as "bar/foo.txt"\n') +expect = test.wrap_stdout(read_str = 'Mkdir("%s")\n' % sub_dir, + build_str = 'Install file: "foo.txt" as "%s"\n' % bar_foo_txt) test.run(options='-n', stdout=expect) -- cgit v0.12