New upstream version 3.0.5upstream/3.0.5

1 files changed, 7 insertions, 19 deletions

diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py
index 5a85b6c..0da1faf 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 103260fce95bf5db1c35fb2371983087d85dd611 2019-07-13 18:25:30 bdbaddog"
 
 import SCons.compat
 
@@ -32,8 +32,6 @@ import unittest
 
 from collections import UserDict
 
-import TestUnit
-
 import SCons.Errors
 
 from SCons.Subst import *
@@ -336,6 +334,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",
 
@@ -1239,21 +1241,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