Get rid of the magicness of the magic _ variables. (Anthony Roach)

3 files changed, 61 insertions, 30 deletions

diff --git a/test/Environment.py b/test/Environment.py
new file mode 100644
index 0000000..ea42e5d
--- /dev/null
+++ b/test/Environment.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2001, 2002 Steven Knight
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#
+
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
+
+import TestSCons
+import sys
+
+python = sys.executable
+
+test = TestSCons.TestSCons()
+
+test.write('SConstruct', """
+env=Environment(BAR='#bar.in', BLAT='subdir/../blat blat')
+target = env.Command('foo.out', 'foo.in', r'%s build.py $SOURCE $TARGET ${File(BAR)} ${Dir(BLAT)}')
+
+assert target == Dir('.').File('foo.out')
+assert Dir('.') == Dir('.').Dir('.')
+assert target == target.File('foo.out')
+"""%python)
+
+test.write('build.py', """
+import sys
+assert sys.argv[1] == 'foo.in', sys.argv[1]
+assert sys.argv[2] == 'foo.out', sys.argv[2]
+assert sys.argv[3] == 'bar.in', sys.argv[3]
+assert sys.argv[4] == 'blat blat', sys.argv[4]
+""")
+
+test.run(arguments='foo.out')
+
+test.pass_test()
diff --git a/test/LIBS.py b/test/LIBS.py
index 0933d6f..b9fb275 100644
--- a/test/LIBS.py
+++ b/test/LIBS.py
@@ -102,8 +102,8 @@ test.run(program=foo_exe, stdout='sub1/bar.c\nsub1/baz.c\n')
 
 #
 test.write('SConstruct', """
-env = Environment(LIBS='baz bar', LIBPATH = '.')
-env.Program(target='foo', source='foo.c')
+env = Environment()
+env.Program(target='foo', source='foo.c', LIBS=['baz', 'bar'], LIBPATH = '.')
 SConscript('sub1/SConscript', 'env')
 SConscript('sub2/SConscript', 'env')
 """)
@@ -125,3 +125,6 @@ test.run(arguments = '.')
 test.run(program=foo_exe, stdout='sub1/bar.c\nsub1/baz.c\n')
 
 test.pass_test()
+
+
+
diff --git a/test/msvc.py b/test/msvc.py
index 0e3c3c2..ed43421 100644
--- a/test/msvc.py
+++ b/test/msvc.py
@@ -126,8 +126,9 @@ SConscript('build/SConscript')
 
 test.write('src/SConscript',"""
 env=Environment()
-env['PCH'] = env.PCH('StdAfx.cpp')[0]
-env['PDB'] = File('#out/test.pdb')
+env.PCH('StdAfx.cpp')
+env['PCH'] = 'StdAfx.pch'
+env['PDB'] = '#out/test.pdb'
 env['PCHSTOP'] = 'StdAfx.h'
 env.Program('#out/test.exe', 'test.cpp')
 """)
@@ -166,32 +167,6 @@ test.fail_test(os.path.exists(test.workpath('build/StdAfx.obj')))
 
 test.write('SConstruct',"""
 env=Environment()
-env['PCH'] = env.PCH('StdAfx.cpp')
-env['PDB'] = File('test.pdb')
-env['PCHSTOP'] = 'StdAfx.h'
-env.Program('test', 'test.cpp')
-""")
-
-test.run(status=2, stderr=r'''
-SCons error: The PCH construction variable must be a File instance: .+
-File "SConstruct", line 6, in \?
-''')
-
-test.write('SConstruct',"""
-env=Environment()
-env['PCH'] = env.PCH('StdAfx.cpp')[0]
-env['PDB'] = 'test.pdb'
-env['PCHSTOP'] = 'StdAfx.h'
-env.Program('test', 'test.cpp')
-""")
-
-test.run(status=2, stderr='''
-SCons error: The PDB construction variable must be a File instance: test.pdb
-File "SConstruct", line 6, in \?
-''')
-
-test.write('SConstruct',"""
-env=Environment()
 env['PCH'] = env.PCH('StdAfx.cpp')[0]
 env['PDB'] = File('test.pdb')
 env.Program('test', 'test.cpp')