From fb093e96aee039d9630040d13f200abce78d73db Mon Sep 17 00:00:00 2001 From: Andreas Tolfsen Date: Sat, 30 Jan 2016 08:55:24 +0000 Subject: [PATCH] Bug 1239987 - Remove marionette-transport dependency from build environment; r=gps --HG-- extra : commitid : CHn3TSL4LL6 extra : rebase_source : dcbf3163d39336098cc16dafedefd8bea75532c7 extra : histedit_source : c3604925fa65e4ffa2d82e0b7c1618a7835b9cf3 --- build/mach_bootstrap.py | 1 - build/virtualenv_packages.txt | 1 - testing/config/marionette_requirements.txt | 1 - testing/testsuite-targets.mk | 1 - 4 files changed, 4 deletions(-) diff --git a/build/mach_bootstrap.py b/build/mach_bootstrap.py index 4f7365ba2eac..e91038031cc0 100644 --- a/build/mach_bootstrap.py +++ b/build/mach_bootstrap.py @@ -72,7 +72,6 @@ SEARCH_PATHS = [ 'testing/luciddream', 'testing/marionette/client', 'testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py', - 'testing/marionette/transport', 'testing/marionette/driver', 'testing/mozbase/mozcrash', 'testing/mozbase/mozdebug', diff --git a/build/virtualenv_packages.txt b/build/virtualenv_packages.txt index 96ad3303f71b..f7b61873c254 100644 --- a/build/virtualenv_packages.txt +++ b/build/virtualenv_packages.txt @@ -1,4 +1,3 @@ -marionette_transport.pth:testing/marionette/transport marionette_driver.pth:testing/marionette/driver browsermobproxy.pth:testing/marionette/client/marionette/runner/mixins/browsermob-proxy-py wptserve.pth:testing/web-platform/tests/tools/wptserve diff --git a/testing/config/marionette_requirements.txt b/testing/config/marionette_requirements.txt index 296c5d61b882..e596b596ef82 100644 --- a/testing/config/marionette_requirements.txt +++ b/testing/config/marionette_requirements.txt @@ -1,6 +1,5 @@ -r mozbase_requirements.txt ../tools/wptserve -../marionette/transport ../marionette/driver ../marionette/marionette/runner/mixins/browsermob-proxy-py ../marionette diff --git a/testing/testsuite-targets.mk b/testing/testsuite-targets.mk index 25cb2c3e7021..c037da11650f 100644 --- a/testing/testsuite-targets.mk +++ b/testing/testsuite-targets.mk @@ -564,7 +564,6 @@ stage-marionette: make-stage-dir $(NSINSTALL) -D $(MARIONETTE_DIR)/transport $(NSINSTALL) -D $(MARIONETTE_DIR)/driver @(cd $(topsrcdir)/testing/marionette/client && tar --exclude marionette/tests $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/ && tar -xf -) - @(cd $(topsrcdir)/testing/marionette/transport && tar $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/transport && tar -xf -) @(cd $(topsrcdir)/testing/marionette/driver && tar $(TAR_CREATE_FLAGS) - *) | (cd $(MARIONETTE_DIR)/driver && tar -xf -) $(PYTHON) $(topsrcdir)/testing/marionette/client/marionette/tests/print-manifest-dirs.py \ $(topsrcdir) \