[Pkg-mozext-commits] [requestpolicy] 153/280: Makefile: possibility to set the mozmill manifest

[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 148e27286ca58b810710b9bf52ad5549d42072ea
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sun Jan 18 15:55:35 2015 +0100

    Makefile: possibility to set the mozmill manifest
---
 Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 49f6ee0..35969ca 100644
--- a/Makefile
+++ b/Makefile
@@ -181,13 +181,20 @@ run: $(xpi_file)
 # see https://github.com/RequestPolicyContinued/requestpolicy/wiki/Setting-up-a-development-environment#unit-tests-for-requestpolicy
 
 mozmill_tests_path := .mozilla/mozmill-tests/
-mozmill_manifest := $(mozmill_tests_path)firefox/tests/addons/$(extension_uuid)/manifest.ini
+mozmill_requestpolicy_test_path := $(mozmill_tests_path)firefox/tests/addons/$(extension_uuid)/
+
+# It's possible to pass the manifest file `mm_manifest` to make
+ifndef mm_manifest
+## default value
+mm_manifest := manifest.ini
+endif
 
 .PHONY: check test mozmill
 check test: mozmill
 
 mozmill: $(xpi_file)
-	mozmill -a $(xpi_file) -b $(binary_firefox_nightly) -m $(mozmill_manifest)
+	mozmill -a $(xpi_file) -b $(binary_firefox_nightly) \
+		-m $(mozmill_requestpolicy_test_path)$(mm_manifest)
 
 
 # ________________

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