Merged default branch into python3-port to keep it up to date.

Hand-updated a few things to keep them python3-safe, and handled
several merge conflicts.

1 files changed, 32 insertions, 0 deletions

diff --git a/src/engine/SCons/cppTests.py b/src/engine/SCons/cppTests.py
index 5a06bee..37b4aae 100644
--- a/src/engine/SCons/cppTests.py
+++ b/src/engine/SCons/cppTests.py
@@ -327,6 +327,22 @@ no_space_input = """
 """
 
 
+nested_ifs_input = """
+#define DEFINED
+
+#ifdef	NOT_DEFINED
+    #include "file7-no"
+    #ifdef DEFINED
+        #include "file8-no"
+    #else
+        #include "file9-no"
+    #endif
+#else
+    #include "file7-yes"
+#endif
+"""
+
+
 
 #    pp_class = PreProcessor
 #    #pp_class = DumbPreProcessor
@@ -403,6 +419,11 @@ class cppTestCase(unittest.TestCase):
         result = self.cpp.process_contents(no_space_input)
         assert expect == result, (expect, result)
 
+    def test_nested_ifs(self):
+        expect = self.nested_ifs_expect
+        result = self.cpp.process_contents(nested_ifs_input)
+        assert expect == result, (expect, result)
+
 class cppAllTestCase(cppTestCase):
     def setUp(self):
         self.cpp = self.cpp_class(current = ".",
@@ -486,6 +507,10 @@ class PreProcessorTestCase(cppAllTestCase):
         ('include', '"', 'file44-yes'),
     ]
 
+    nested_ifs_expect = [
+        ('include', '"', 'file7-yes'),
+    ]
+
 class DumbPreProcessorTestCase(cppAllTestCase):
     cpp_class = cpp.DumbPreProcessor
 
@@ -591,6 +616,13 @@ class DumbPreProcessorTestCase(cppAllTestCase):
         ('include', '"', 'file44-yes'),
     ]
 
+    nested_ifs_expect = [
+        ('include', '"', 'file7-no'),
+        ('include', '"', 'file8-no'),
+        ('include', '"', 'file9-no'),
+        ('include', '"', 'file7-yes')
+    ]
+
 
 
 import os