Bug 1107336: update build and test targets to use new marionette driver; r=jgriffin

This commit is contained in:
David Burns 2015-02-23 14:45:50 +00:00
parent 3de88cbfb6
commit e7ad6e5298
4 changed files with 5 additions and 0 deletions

View File

@ -51,6 +51,7 @@ SEARCH_PATHS = [
'testing/marionette/client',
'testing/marionette/client/marionette',
'testing/marionette/transport',
'testing/marionette/driver',
'testing/mozbase/mozcrash',
'testing/mozbase/mozdebug',
'testing/mozbase/mozdevice',

View File

@ -1,4 +1,5 @@
marionette_transport.pth:testing/marionette/transport
marionette_driver.pth:testing/marionette/driver
marionette.pth:testing/marionette/client
blessings.pth:python/blessings
configobj.pth:python/configobj

View File

@ -1,3 +1,4 @@
-r mozbase_requirements.txt
../marionette/transport
../marionette/driver
../marionette

View File

@ -536,8 +536,10 @@ MARIONETTE_DIR=$(PKG_STAGE)/marionette
stage-marionette: make-stage-dir
$(NSINSTALL) -D $(MARIONETTE_DIR)/tests
$(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) \
$(topsrcdir)/testing/marionette/client/marionette/tests/unit-tests.ini \