summaryrefslogtreecommitdiff
path: root/src/engine/SCons/EnvironmentTests.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 18:15:03 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 18:15:03 +0200
commit301edd26f23e3d954dcea5cffc1ad13f969822ca (patch)
treeb0dd8f1b1da7c48da076ae45fc9529e748d082f0 /src/engine/SCons/EnvironmentTests.py
parente20c9557371eacec533588d33b4bebd543ba178f (diff)
Imported Upstream version 2.5.0+repackupstream/2.5.0+repack
Diffstat (limited to 'src/engine/SCons/EnvironmentTests.py')
-rw-r--r--src/engine/SCons/EnvironmentTests.py29
1 files changed, 2 insertions, 27 deletions
diff --git a/src/engine/SCons/EnvironmentTests.py b/src/engine/SCons/EnvironmentTests.py
index 9cc6050..91cd377 100644
--- a/src/engine/SCons/EnvironmentTests.py
+++ b/src/engine/SCons/EnvironmentTests.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2001 - 2015 The SCons Foundation
+# Copyright (c) 2001 - 2016 The SCons Foundation
#
# Permission is hereby granted, free of charge, to any person obtaining
# a copy of this software and associated documentation files (the
@@ -21,7 +21,7 @@
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/EnvironmentTests.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "src/engine/SCons/EnvironmentTests.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
import SCons.compat
@@ -862,31 +862,6 @@ sys.exit(0)
assert env['A'] == ['aaa'], env['A']
assert env['B'] == ['bbb'], env['B']
-# def test_MergeShellPaths(self):
-# """Test the MergeShellPaths() method
-# """
-# env = Environment()
-# env.MergeShellPaths({})
-# assert not env['ENV'].has_key('INCLUDE'), env['INCLUDE']
-# env.MergeShellPaths({'INCLUDE': r'c:\Program Files\Stuff'})
-# assert env['ENV']['INCLUDE'] == r'c:\Program Files\Stuff', env['ENV']['INCLUDE']
-# env.MergeShellPaths({'INCLUDE': r'c:\Program Files\Stuff'})
-# assert env['ENV']['INCLUDE'] == r'c:\Program Files\Stuff', env['ENV']['INCLUDE']
-# env.MergeShellPaths({'INCLUDE': r'xyz'})
-# assert env['ENV']['INCLUDE'] == r'xyz%sc:\Program Files\Stuff'%os.pathsep, env['ENV']['INCLUDE']
-
-# env = Environment()
-# env['ENV']['INCLUDE'] = 'xyz'
-# env.MergeShellPaths({'INCLUDE':['c:/inc1', 'c:/inc2']} )
-# assert env['ENV']['INCLUDE'] == r'c:/inc1%sc:/inc2%sxyz'%(os.pathsep, os.pathsep), env['ENV']['INCLUDE']
-
-# # test prepend=0
-# env = Environment()
-# env.MergeShellPaths({'INCLUDE': r'c:\Program Files\Stuff'}, prepend=0)
-# assert env['ENV']['INCLUDE'] == r'c:\Program Files\Stuff', env['ENV']['INCLUDE']
-# env.MergeShellPaths({'INCLUDE': r'xyz'}, prepend=0)
-# assert env['ENV']['INCLUDE'] == r'c:\Program Files\Stuff%sxyz'%os.pathsep, env['ENV']['INCLUDE']
-
class BaseTestCase(unittest.TestCase,TestEnvironmentFixture):