Bug 1413195 - Vendor webdriver's dependencies through geckodriver r=jgraham draft
authorAndreas Tolfsen <ato@sny.no>
Fri, 03 Nov 2017 14:02:09 +0000
changeset 694294 fb28ffee805b8932fd32c08af561eb69439569c5
parent 694164 7851d6768dfd9fe5568d1315a98f142d9bb9234f
child 739303 af4334396680750311c28dc3c3c18149641ba668
push id88095
push userbmo:ato@sny.no
push dateTue, 07 Nov 2017 16:36:51 +0000
reviewersjgraham
bugs1413195, 1412037
milestone58.0a1
Bug 1413195 - Vendor webdriver's dependencies through geckodriver r=jgraham The webdriver crate's dependencies are accounted for through geckodriver's Cargo.lock file, because the webdriver dependency is given by path. This commit reverts 540273e5cf22 made in bug 1412037. MozReview-Commit-ID: F0q9bDN3pqd
python/mozbuild/mozbuild/vendor_rust.py
--- a/python/mozbuild/mozbuild/vendor_rust.py
+++ b/python/mozbuild/mozbuild/vendor_rust.py
@@ -265,17 +265,16 @@ license file's hash.
         mozfile.remove(vendor_dir)
         # Once we require a new enough cargo to switch to workspaces, we can
         # just do this once on the workspace root crate.
         crates_and_roots = (
             ('gkrust', 'toolkit/library/rust'),
             ('gkrust-gtest', 'toolkit/library/gtest/rust'),
             ('js', 'js/rust'),
             ('mozjs_sys', 'js/src'),
-            ('webdriver', 'testing/webdriver'),
             ('geckodriver', 'testing/geckodriver'),
         )
 
         lockfiles = []
         for (lib, crate_root) in crates_and_roots:
             path = mozpath.join(self.topsrcdir, crate_root)
             # We use check_call instead of mozprocess to ensure errors are displayed.
             # We do an |update -p| here to regenerate the Cargo.lock file with minimal changes. See bug 1324462