Merge branch 'release/debian/3.1.0+repack-1'debian/3.1.0+repack-1

1 files changed, 9 insertions, 20 deletions

diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py
index 5a85b6c..49a9a2f 100644
--- a/src/engine/SCons/SubstTests.py
+++ b/src/engine/SCons/SubstTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2017 The SCons Foundation
+# Copyright (c) 2001 - 2019 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -22,7 +22,7 @@
 #
 from __future__ import print_function
 
-__revision__ = "src/engine/SCons/SubstTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
+__revision__ = "src/engine/SCons/SubstTests.py e724ae812eb96f4858a132f5b8c769724744faf6 2019-07-21 00:04:47 bdeegan"
 
 import SCons.compat
 
@@ -32,8 +32,6 @@ import unittest
 
 from collections import UserDict
 
-import TestUnit
-
 import SCons.Errors
 
 from SCons.Subst import *
@@ -134,6 +132,7 @@ class SubstTestCase(unittest.TestCase):
         def __str__(self):
             return self.value
 
+    # only use of this is currently commented out below
     def function_foo(arg):
         pass
 
@@ -336,6 +335,10 @@ class scons_subst_TestCase(SubstTestCase):
         # Test double-dollar-sign behavior.
         "$$FFF$HHH",            "$FFFIII",
 
+        # Test double-dollar-sign before open paren. It's not meant
+        # to be signature escaping
+        'echo $$(pwd) > XYZ',   'echo $(pwd) > XYZ',
+
         # Test that a Literal will stop dollar-sign substitution.
         "$XXX $LITERAL $FFF",   "GGG $XXX GGG",
 
@@ -1044,7 +1047,7 @@ class scons_subst_list_TestCase(SubstTestCase):
         node = scons_subst_list("$NODE", env, mode=SUBST_SIG, conv=s, gvars=gvars)
         assert node == [[n1]], node
 
-    def test_subst_list_overriding_gvars(self):
+    def test_subst_list_overriding_gvars2(self):
         """Test scons_subst_list():  supplying an overriding gvars dictionary"""
         env = DummyEnv({'XXX' : 'xxx'})
         result = scons_subst_list('$XXX', env, gvars=env.Dictionary())
@@ -1239,21 +1242,7 @@ class subst_dict_TestCase(unittest.TestCase):
         assert SOURCES == ['s3', 'v-rstr-s4', 'v-s5'], SOURCES
 
 if __name__ == "__main__":
-    suite = unittest.TestSuite()
-    tclasses = [
-        CLVar_TestCase,
-        LiteralTestCase,
-        SpecialAttrWrapperTestCase,
-        quote_spaces_TestCase,
-        scons_subst_TestCase,
-        scons_subst_list_TestCase,
-        scons_subst_once_TestCase,
-        subst_dict_TestCase,
-    ]
-    for tclass in tclasses:
-        names = unittest.getTestCaseNames(tclass, 'test_')
-        suite.addTests(list(map(tclass, names)))
-    TestUnit.run(suite)
+    unittest.main()
 
 # Local Variables:
 # tab-width:4