Bug 784841 - Part 12: Don't recurse into static tier directories; r=ted

python/mozbuild/mozbuild/frontend/reader.py

@@ -588,13 +588,14 @@ class BuildReader(object):
                     'TIERS defined but it should not be')
 
             for tier, values in sandbox['TIERS'].items():
-                for var in ('regular', 'static'):
-                    for d in values[var]:
-                        if d in dirs:
-                            raise SandboxValidationError(
-                                'Tier directory (%s) registered multiple '
-                                'times in %s' % (d, tier))
-                        dirs.append(d)
+                # We don't descend into static directories because static by
+                # definition is external to the build system.
+                for d in values['regular']:
+                    if d in dirs:
+                        raise SandboxValidationError(
+                            'Tier directory (%s) registered multiple '
+                            'times in %s' % (d, tier))
+                    dirs.append(d)
 
         curdir = os.path.dirname(path)
         for relpath in dirs:

python/mozbuild/mozbuild/test/frontend/test_emitter.py

@@ -87,11 +87,10 @@ class TestEmitterBasic(unittest.TestCase):
         emitter = TreeMetadataEmitter(reader.config)
 
         objs = list(emitter.emit(reader.read_topsrcdir()))
-        self.assertEqual(len(objs), 6)
+        self.assertEqual(len(objs), 4)
 
         reldirs = [o.relativedir for o in objs]
-        self.assertEqual(reldirs, ['', 'foo', 'foo/biz', 'foo_static', 'bar',
-            'baz'])
+        self.assertEqual(reldirs, ['', 'foo', 'foo/biz', 'bar'])
 
     def test_config_file_substitution(self):
         reader = self.reader('config-file-substitution')

python/mozbuild/mozbuild/test/frontend/test_reader.py

@@ -70,7 +70,7 @@ class TestBuildReader(unittest.TestCase):
         reader = self.reader('traversal-tier-simple')
 
         sandboxes = list(reader.read_topsrcdir())
-        self.assertEqual(len(sandboxes), 6)
+        self.assertEqual(len(sandboxes), 4)
 
     def test_tier_subdir(self):
         # add_tier_dir() should fail when not in the top directory.