New upstream version 3.0.0upstream/3.0.0

1 files changed, 56 insertions, 27 deletions

diff --git a/src/engine/SCons/SubstTests.py b/src/engine/SCons/SubstTests.py
index 1d42a57..5a85b6c 100644
--- a/src/engine/SCons/SubstTests.py
+++ b/src/engine/SCons/SubstTests.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001 - 2016 The SCons Foundation
+# Copyright (c) 2001 - 2017 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -20,8 +20,9 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+from __future__ import print_function
 
-__revision__ = "src/engine/SCons/SubstTests.py rel_2.5.1:3735:9dc6cee5c168 2016/11/03 14:02:02 bdbaddog"
+__revision__ = "src/engine/SCons/SubstTests.py rel_3.0.0:4395:8972f6a2f699 2017/09/18 12:59:24 bdbaddog"
 
 import SCons.compat
 
@@ -182,6 +183,9 @@ class SubstTestCase(unittest.TestCase):
         'HHH'       : 'III',
         'FFFIII'    : 'BADNEWS',
 
+        'THING1'    : "$(STUFF$)",
+        'THING2'    : "$THING1",
+
         'LITERAL'   : TestLiteral("$XXX"),
 
         # Test that we can expand to and return a function.
@@ -243,14 +247,14 @@ class SubstTestCase(unittest.TestCase):
             expect = convert(expect)
             try:
                 result = function(input, env, **kwargs)
-            except Exception, e:
+            except Exception as e:
                 fmt = "    input %s generated %s (%s)"
-                print fmt % (repr(input), e.__class__.__name__, repr(e))
+                print(fmt % (repr(input), e.__class__.__name__, repr(e)))
                 failed = failed + 1
             else:
                 if result != expect:
-                    if failed == 0: print
-                    print "    input %s => %s did not match %s" % (repr(input), repr(result), repr(expect))
+                    if failed == 0: print()
+                    print("    input %s => \n%s did not match \n%s" % (repr(input), repr(result), repr(expect)))
                     failed = failed + 1
             del cases[:2]
         fmt = "%d %s() cases failed"
@@ -404,6 +408,11 @@ class scons_subst_TestCase(SubstTestCase):
             "test",
             "test",
 
+        "test $( $THING2 $)",
+            "test $( $(STUFF$) $)",
+            "test STUFF",
+            "test",
+
         "$AAA ${AAA}A $BBBB $BBB",
             "a aA  b",
             "a aA b",
@@ -462,18 +471,18 @@ class scons_subst_TestCase(SubstTestCase):
             input, eraw, ecmd, esig = subst_cases[:4]
             result = scons_subst(input, env, mode=SUBST_RAW, gvars=gvars)
             if result != eraw:
-                if failed == 0: print
-                print "    input %s => RAW %s did not match %s" % (repr(input), repr(result), repr(eraw))
+                if failed == 0: print()
+                print("    input %s => RAW %s did not match %s" % (repr(input), repr(result), repr(eraw)))
                 failed = failed + 1
             result = scons_subst(input, env, mode=SUBST_CMD, gvars=gvars)
             if result != ecmd:
-                if failed == 0: print
-                print "    input %s => CMD %s did not match %s" % (repr(input), repr(result), repr(ecmd))
+                if failed == 0: print()
+                print("    input %s => CMD %s did not match %s" % (repr(input), repr(result), repr(ecmd)))
                 failed = failed + 1
             result = scons_subst(input, env, mode=SUBST_SIG, gvars=gvars)
             if result != esig:
-                if failed == 0: print
-                print "    input %s => SIG %s did not match %s" % (repr(input), repr(result), repr(esig))
+                if failed == 0: print()
+                print("    input %s => SIG %s did not match %s" % (repr(input), repr(result), repr(esig)))
                 failed = failed + 1
             del subst_cases[:4]
         assert failed == 0, "%d subst() mode cases failed" % failed
@@ -516,7 +525,7 @@ class scons_subst_TestCase(SubstTestCase):
             class Foo(object):
                 pass
             scons_subst('${foo.bar}', env, gvars={'foo':Foo()})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = [
                 "AttributeError `bar' trying to evaluate `${foo.bar}'",
                 "AttributeError `Foo instance has no attribute 'bar'' trying to evaluate `${foo.bar}'",
@@ -532,7 +541,7 @@ class scons_subst_TestCase(SubstTestCase):
         env = DummyEnv(self.loc)
         try:
             scons_subst('$foo.bar.3.0', env)
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = [
                 # Python 2.3, 2.4
                 "SyntaxError `invalid syntax (line 1)' trying to evaluate `$foo.bar.3.0'",
@@ -543,12 +552,29 @@ class scons_subst_TestCase(SubstTestCase):
         else:
             raise AssertionError("did not catch expected UserError")
 
+    def test_subst_balance_errors(self):
+        """Test scons_subst():  handling syntax errors"""
+        env = DummyEnv(self.loc)
+        try:
+            scons_subst('$(', env, mode=SUBST_SIG)
+        except SCons.Errors.UserError as e:
+            assert str(e) == "Unbalanced $(/$) in: $(", str(e)
+        else:
+            raise AssertionError("did not catch expected UserError")
+
+        try:
+            scons_subst('$)', env, mode=SUBST_SIG)
+        except SCons.Errors.UserError as e:
+            assert str(e) == "Unbalanced $(/$) in: $)", str(e)
+        else:
+            raise AssertionError("did not catch expected UserError")
+
     def test_subst_type_errors(self):
         """Test scons_subst():  handling type errors"""
         env = DummyEnv(self.loc)
         try:
             scons_subst("${NONE[2]}", env, gvars={'NONE':None})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = [
                 # Python 2.3, 2.4
                 "TypeError `unsubscriptable object' trying to evaluate `${NONE[2]}'",
@@ -567,10 +593,13 @@ class scons_subst_TestCase(SubstTestCase):
             def func(a, b, c):
                 pass
             scons_subst("${func(1)}", env, gvars={'func':func})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = [
                 # Python 2.3, 2.4, 2.5
-                "TypeError `func() takes exactly 3 arguments (1 given)' trying to evaluate `${func(1)}'"
+                "TypeError `func() takes exactly 3 arguments (1 given)' trying to evaluate `${func(1)}'",
+
+                # Python 3.5 (and 3.x?)
+                "TypeError `func() missing 2 required positional arguments: 'b' and 'c'' trying to evaluate `${func(1)}'"
             ]
             assert str(e) in expect, repr(str(e))
         else:
@@ -937,18 +966,18 @@ class scons_subst_list_TestCase(SubstTestCase):
             input, eraw, ecmd, esig = subst_list_cases[:4]
             result = scons_subst_list(input, env, mode=SUBST_RAW, gvars=gvars)
             if result != eraw:
-                if failed == 0: print
-                print "    input %s => RAW %s did not match %s" % (repr(input), repr(result), repr(eraw))
+                if failed == 0: print()
+                print("    input %s => RAW %s did not match %s" % (repr(input), repr(result), repr(eraw)))
                 failed = failed + 1
             result = scons_subst_list(input, env, mode=SUBST_CMD, gvars=gvars)
             if result != ecmd:
-                if failed == 0: print
-                print "    input %s => CMD %s did not match %s" % (repr(input), repr(result), repr(ecmd))
+                if failed == 0: print()
+                print("    input %s => CMD %s did not match %s" % (repr(input), repr(result), repr(ecmd)))
                 failed = failed + 1
             result = scons_subst_list(input, env, mode=SUBST_SIG, gvars=gvars)
             if result != esig:
-                if failed == 0: print
-                print "    input %s => SIG %s did not match %s" % (repr(input), repr(result), repr(esig))
+                if failed == 0: print()
+                print("    input %s => SIG %s did not match %s" % (repr(input), repr(result), repr(esig)))
                 failed = failed + 1
             del subst_list_cases[:4]
         assert failed == 0, "%d subst() mode cases failed" % failed
@@ -960,7 +989,7 @@ class scons_subst_list_TestCase(SubstTestCase):
             class Foo(object):
                 pass
             scons_subst_list('${foo.bar}', env, gvars={'foo':Foo()})
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = [
                 "AttributeError `bar' trying to evaluate `${foo.bar}'",
                 "AttributeError `Foo instance has no attribute 'bar'' trying to evaluate `${foo.bar}'",
@@ -976,7 +1005,7 @@ class scons_subst_list_TestCase(SubstTestCase):
         env = DummyEnv()
         try:
             scons_subst_list('$foo.bar.3.0', env)
-        except SCons.Errors.UserError, e:
+        except SCons.Errors.UserError as e:
             expect = [
                 "SyntaxError `invalid syntax' trying to evaluate `$foo.bar.3.0'",
                 "SyntaxError `invalid syntax (line 1)' trying to evaluate `$foo.bar.3.0'",
@@ -1084,8 +1113,8 @@ class scons_subst_once_TestCase(unittest.TestCase):
             input, key, expect = cases[:3]
             result = scons_subst_once(input, env, key)
             if result != expect:
-                if failed == 0: print
-                print "    input %s (%s) => %s did not match %s" % (repr(input), repr(key), repr(result), repr(expect))
+                if failed == 0: print()
+                print("    input %s (%s) => %s did not match %s" % (repr(input), repr(key), repr(result), repr(expect)))
                 failed = failed + 1
             del cases[:3]
         assert failed == 0, "%d subst() cases failed" % failed