[Pkg-mozext-commits] [requestpolicy] 116/257: [tst][imp] Makefile/Marionette: run enabling E10s

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit a91980d92b013e0718c107f326abf20737e7431d
Author: Martin Kimmerle <dev at 256k.de>
Date:   Thu Oct 22 02:52:46 2015 +0200

    [tst][imp] Makefile/Marionette: run enabling E10s
    
    Allow to run Marionette tests with E10s enabled, using the
    `make` command. One must pass "--e10s":
    
        make marionette marionette_prefs="--e10s"
---
 Makefile                  | 3 ++-
 tests/mozrunner-prefs.ini | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 8e53d1d..7200597 100644
--- a/Makefile
+++ b/Makefile
@@ -545,6 +545,7 @@ $(mozmill_rpc_test_dir)/data: $(mozmill_rpc_test_dir)
 marionette_tests := tests/marionette/rp_puppeteer/tests/manifest.ini
 marionette_tests += tests/marionette/tests/manifest.ini
 
+marionette_prefs :=
 
 .PHONY: marionette
 marionette: venv \
@@ -559,7 +560,7 @@ marionette: venv \
 	source .venv/bin/activate ; \
 	export PYTHONPATH=tests/marionette/ ; \
 	profile_dir=`mozprofile -a $(unit_testing__xpi_file) -a $(dev_helper__xpi_file) --preferences=$(mozrunner_prefs_ini):marionette` ; \
-	firefox-ui-tests --binary=$(app_binary) --profile=$$profile_dir $(marionette_tests) ; \
+	firefox-ui-tests --binary=$(app_binary) --profile=$$profile_dir $(marionette_prefs) $(marionette_tests) ; \
 	rm -rf $$profile_dir ; \
 	)
 
diff --git a/tests/mozrunner-prefs.ini b/tests/mozrunner-prefs.ini
index 7d571ab..e031a5d 100644
--- a/tests/mozrunner-prefs.ini
+++ b/tests/mozrunner-prefs.ini
@@ -47,3 +47,6 @@ xpinstall.signatures.required=false
 # speed up installation and enable/disable/uninstall of add-ons
 extensions.webservice.discoverURL=about:home
 security.dialog_enable_delay=0
+
+# Hide the E10s notification bar.
+browser.displayedE10SNotice=4
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git