Bug 1305795 - Use tooltool manifest from source checkout; r?ted draft
authorGregory Szorc <gps@mozilla.com>
Tue, 27 Sep 2016 13:29:30 -0700
changeset 418560 7a3db9326a6dd5d6ca452de948cdf2aca695a495
parent 418559 bdf25dc77c2bbe734bee0810bb678f3912ca51bf
child 418561 20778ec3ffb51c8359ac1a993057323f0f9e6438
push id30707
push userbmo:gps@mozilla.com
push dateWed, 28 Sep 2016 18:02:51 +0000
reviewersted
bugs1305795
milestone52.0a1
Bug 1305795 - Use tooltool manifest from source checkout; r?ted With the pip requirements file being used from the source checkout, the only file from config/ that was still being referenced was a releng.manifest tooltool manifest used for obtaining the minidump binary. This commit modifies TestingMixin to use the manifest from the source checkout if available. Otherwise it assumes the manifest is in pwd (preserves existing behavior). the WPT script has been modified to no longer extract the config/ directory from common.tests.zip. MozReview-Commit-ID: NuEi4FXRBQ
testing/mozharness/mozharness/mozilla/testing/testbase.py
testing/mozharness/scripts/web_platform_tests.py
--- a/testing/mozharness/mozharness/mozilla/testing/testbase.py
+++ b/testing/mozharness/mozharness/mozilla/testing/testbase.py
@@ -680,17 +680,24 @@ Did you run with --create-virtualenv? Is
 
         self.info('Minidump tooltool manifest unknown. Determining based upon '
                   'platform and architecture.')
         platform_name = self.platform_name()
 
         if platform_name:
             tooltool_path = "config/tooltool-manifests/%s/releng.manifest" % \
                 TOOLTOOL_PLATFORM_DIR[platform_name]
-            return tooltool_path
+
+            # If we're running from a source checkout, reference the manifest
+            # from there. Otherwise, assume the path is relative to pwd and
+            # comes from common.tests.zip.
+            if self.topsrcdir:
+                return os.path.join(self.topsrcdir, 'testing', tooltool_path)
+            else:
+                return tooltool_path
         else:
             self.fatal('We could not determine the minidump\'s filename.')
 
     def query_minidump_filename(self):
         if self.config.get('minidump_stackwalk_path'):
             return self.config['minidump_stackwalk_path']
 
         self.info('Minidump filename unknown. Determining based upon platform '
--- a/testing/mozharness/scripts/web_platform_tests.py
+++ b/testing/mozharness/scripts/web_platform_tests.py
@@ -178,17 +178,16 @@ class WebPlatformTest(TestingMixin, Merc
         cmd.extend(self.query_tests_args(try_tests,
                                          str_format_values=str_format_values))
 
         return cmd
 
     def download_and_extract(self):
         super(WebPlatformTest, self).download_and_extract(
             extract_dirs=["bin/*",
-                          "config/*",
                           "mozinfo.json"],
             suite_categories=["web-platform"])
 
     def run_tests(self):
         dirs = self.query_abs_dirs()
         cmd = self._query_cmd()
 
         parser = StructuredOutputParser(config=self.config,