Backed out changeset e4e02bf4f094 (bug 1341502) for failing TestTestManifestBackend.test_test_manifest_sources on Windows. r=backout on a CLOSED TREE
authorSebastian Hengst <archaeopteryx@coole-files.de>
Thu, 23 Feb 2017 21:42:37 +0100
changeset 373551 47fd19d08a8359c78149754b8c13ab17052140bc
parent 373550 aab8d4792b9b9b4ec393620d5ec44920d701d78b
child 373552 19da94c09bfd66354d72e291a943b9469a4b9d21
push id10863
push userjlorenzo@mozilla.com
push dateMon, 06 Mar 2017 23:02:23 +0000
treeherdermozilla-aurora@0931190cd725 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1341502
milestone54.0a1
backs oute4e02bf4f094e464bd55404ce78e1e0aa5b7b2ab
Backed out changeset e4e02bf4f094 (bug 1341502) for failing TestTestManifestBackend.test_test_manifest_sources on Windows. r=backout on a CLOSED TREE
python/mozbuild/mozbuild/backend/test_manifest.py
python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/mochitest-common.ini
python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/mochitest.ini
python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/moz.build
python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/test_bar.js
python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/test_foo.js
python/mozbuild/mozbuild/test/backend/test_test_manifest.py
--- a/python/mozbuild/mozbuild/backend/test_manifest.py
+++ b/python/mozbuild/mozbuild/backend/test_manifest.py
@@ -27,19 +27,16 @@ class TestManifestBackend(PartialBackend
             self.environment.topobjdir, 'config.status'))
 
     def consume_object(self, obj):
         if not isinstance(obj, TestManifest):
             return
 
         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
 
             if isinstance(obj.manifest, ReftestManifest):
                 # Mark included files as part of the build backend so changes
                 # result in re-config.
                 self.backend_input_files |= obj.manifest.manifests
         except ImportError:
deleted file mode 100644
--- a/python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/mochitest-common.ini
+++ /dev/null
@@ -1,1 +0,0 @@
-[test_bar.js]
deleted file mode 100644
--- a/python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/mochitest.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[test_foo.js]
-[include:mochitest-common.ini]
deleted file mode 100644
--- a/python/mozbuild/mozbuild/test/backend/data/test-manifests-backend-sources/moz.build
+++ /dev/null
@@ -1,6 +0,0 @@
-# Any copyright is dedicated to the Public Domain.
-# http://creativecommons.org/publicdomain/zero/1.0/
-
-MOCHITEST_MANIFESTS += [
-    'mochitest.ini',
-]
deleted file mode 100644
deleted file mode 100644
--- a/python/mozbuild/mozbuild/test/backend/test_test_manifest.py
+++ b/python/mozbuild/mozbuild/test/backend/test_test_manifest.py
@@ -63,30 +63,11 @@ class TestTestManifestBackend(BackendTes
                           set(['dir1/xpcshell.ini',
                                'xpcshell.ini',
                                'mochitest.ini']))
 
         manifest_path = mozpath.join(env.topsrcdir, 'xpcshell.ini')
         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()