Bug 1341502: Fix automatic regeneration of backend when an included test manifest changes. r=mshal

MozReview-Commit-ID: 1ZQNQpqboz9

python/mozbuild/mozbuild/backend/test_manifest.py

@@ -32,6 +32,9 @@ class TestManifestBackend(PartialBackend):
 
         self.backend_input_files.add(obj.path)
         self.backend_input_files |= obj.context_all_paths
+        for source in obj.source_relpaths:
+            self.backend_input_files.add(mozpath.join(obj.topsrcdir,
+                                                      source))
         try:
             from reftest import ReftestManifest
 

python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/mochitest-common.ini

@@ -0,0 +1 @@
+[test_bar.js]

python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/mochitest.ini

@@ -0,0 +1,2 @@
+[test_foo.js]
+[include:mochitest-common.ini]

python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/moz.build

@@ -0,0 +1,6 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+MOCHITEST_MANIFESTS += [
+    'mochitest.ini',
+]

python/mozbuild/mozbuild/test/backend/test_test_manifest.py

@@ -68,6 +68,25 @@ class TestTestManifestBackend(BackendTester):
         self.assertIn('here', o[manifest_path])
         self.assertIn('support-files', o[manifest_path])
 
+    def test_test_manifest_sources(self):
+        """Ensure that backend sources are generated correctly."""
+        env = self._consume('test-manifests-backend-sources', TestManifestBackend)
+
+        backend_path = mozpath.join(env.topobjdir, 'backend.TestManifestBackend.in')
+        self.assertTrue(os.path.exists(backend_path))
+
+        status_path = mozpath.join(env.topobjdir, 'config.status')
+
+        with open(backend_path, 'r') as fh:
+            sources = set(mozpath.relpath(source.strip(), env.topsrcdir)
+                          for source in fh)
+
+        self.assertEquals(sources,
+                          set(['mochitest.ini',
+                               'mochitest-common.ini',
+                               'moz.build',
+                               mozpath.relpath(status_path, env.topsrcdir)]))
+
 
 if __name__ == '__main__':
     main()