From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Thu, 16 Jan 2003 17:40:05 +0000 (+0000)
Subject: Win32 portability.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=19110aa81069608ddac570fb4aaa8c2b765be3de;p=scons.git

Win32 portability.


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

diff --git a/test/option-c.py b/test/option-c.py
index 15a33f3d..36c5d8ae 100644
--- a/test/option-c.py
+++ b/test/option-c.py
@@ -182,8 +182,7 @@ test.fail_test(os.path.exists(test.workpath('foo2.xxx')))
 test.fail_test(test.read(test.workpath('foo2.out')) != "foo2.in\n")
 test.fail_test(test.read(test.workpath('foo3.out')) != "foo3.in\n")
 
-expect = test.wrap_stdout("""Removed subd/foox.in
-""")
+expect = test.wrap_stdout("Removed %s\n" % os.path.join('subd', 'foox.in'))
 test.run(arguments = '-c subd', stdout=expect)
 test.fail_test(os.path.exists(test.workpath('foox.in')))
 
@@ -191,9 +190,9 @@ expect = test.wrap_stdout("""Removed foo1.out
 Removed foo2.out
 Removed foo3.out
 Removed %s
-Removed subd/SConscript
+Removed %s
 Removed directory subd
-""" % os.path.join('subd','foon.in'))
+""" % (os.path.join('subd','foon.in'), os.path.join('subd', 'SConscript')))
 test.run(arguments = '-c .', stdout=expect)
 test.fail_test(os.path.exists(test.workpath('subdir', 'foon.in')))
 test.fail_test(os.path.exists(test.workpath('subdir')))