summaryrefslogtreecommitdiff
path: root/src/engine/SCons/SubstTests.py
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 18:15:18 +0200
committerJörg Frings-Fürst <debian@jff-webhosting.net>2016-04-10 18:15:18 +0200
commit31d57e6191a51b64bb0141cdc6b9aef849977208 (patch)
treef81db7bcab6358e06610848ea3a960102d2dfaab /src/engine/SCons/SubstTests.py
parentaa3efbff633b3a37ef0b10f14e35af5f58b68bb6 (diff)
parent301edd26f23e3d954dcea5cffc1ad13f969822ca (diff)
Merge tag 'upstream/2.5.0+repack'
Upstream version 2.5.0+repack
Diffstat (limited to 'src/engine/SCons/SubstTests.py')
-rw-r--r--src/engine/SCons/SubstTests.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py
index ba4e408..e7791f7 100644
--- a/src/engine/SCons/SubstTests.py
+++ b/src/engine/SCons/SubstTests.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/SubstTests.py rel_2.4.1:3453:73fefd3ea0b0 2015/11/09 03:25:05 bdbaddog"
+__revision__ = "src/engine/SCons/SubstTests.py rel_2.5.0:3543:937e55cd78f7 2016/04/09 11:29:54 bdbaddog"
import SCons.compat
@@ -604,17 +604,6 @@ class scons_subst_TestCase(SubstTestCase):
node = scons_subst("$NODE", env, mode=SUBST_SIG, conv=s, gvars=gvars)
assert node is n1, node
- #def test_subst_function_return(self):
- # """Test scons_subst(): returning a function"""
- # env = DummyEnv({'FUNCTION' : foo})
- # gvars = env.Dictionary()
- # func = scons_subst("$FUNCTION", env, mode=SUBST_RAW, call=None, gvars=gvars)
- # assert func is function_foo, func
- # func = scons_subst("$FUNCTION", env, mode=SUBST_CMD, call=None, gvars=gvars)
- # assert func is function_foo, func
- # func = scons_subst("$FUNCTION", env, mode=SUBST_SIG, call=None, gvars=gvars)
- # assert func is function_foo, func
-
def test_subst_overriding_gvars(self):
"""Test scons_subst(): supplying an overriding gvars dictionary"""
env = DummyEnv({'XXX' : 'xxx'})