From: garyo <garyo@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Tue, 12 May 2009 12:46:33 +0000 (+0000)
Subject: Fix site_scons/site_init.py test failure on Windows by using 'type' instead of 'cat... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=66c1dbc1e5cddbb8c22cd1211af00504ba693971;p=scons.git

Fix site_scons/site_init.py test failure on Windows by using 'type' instead of 'cat' if win32.

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

diff --git a/test/site_scons/site_init.py b/test/site_scons/site_init.py
index 231f36c3..83c9a7f9 100644
--- a/test/site_scons/site_init.py
+++ b/test/site_scons/site_init.py
@@ -25,6 +25,7 @@
 __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
 
 import TestSCons
+import sys
 
 """
 Verify site_scons/site_init.py file can define a tool, and it shows up
@@ -35,14 +36,19 @@ test = TestSCons.TestSCons()
 
 test.subdir('site_scons')
 
+if sys.platform == 'win32':
+    cat_cmd='type'
+else:
+    cat_cmd='cat'
+
 test.write(['site_scons', 'site_init.py'], """
 def TOOL_FOO(env):
-      env['FOO'] = 'cat'
+      env['FOO'] = '%s'
       bld = Builder(action = '$FOO ${SOURCE} > ${TARGET}',
 				      suffix = '.tgt')
       env.Append(BUILDERS = {'Foo' : bld})
 
-""")
+"""%cat_cmd)
 
 test.write('SConstruct', """
 e=Environment(tools=['default', TOOL_FOO])
@@ -50,7 +56,7 @@ e.Foo(target='foo.out', source='SConstruct')
 """)
 
 test.run(arguments = '-Q .',
-         stdout = """cat SConstruct > foo.out\n""")
+         stdout = """%s SConstruct > foo.out\n"""%cat_cmd)
 
 
 """