bug 440675, add USE_EXTENSION_MANIFEST coveragae to jar.mn tests, r=ted
authorAxel Hecht <l10n@mozilla.com>
Mon, 23 Jun 2008 21:26:26 +0200
changeset 15485 9756a45384e63429723dafb1604452995a4d33b1
parent 15484 9737aa36303755d1fd38beb7950dd7ca44efdf6c
child 15486 2cbe07bd5857f8c029102d736f2e8077f3011f7a
child 15490 0f084c7ce4df395c47e79fcd79cef094ecb8de15
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs440675
milestone1.9.1a1pre
bug 440675, add USE_EXTENSION_MANIFEST coveragae to jar.mn tests, r=ted
config/Makefile.in
config/tests/chrome.manifest.flat
config/tests/src-simple/Makefile.in
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -161,11 +161,12 @@ check-preprocessor::
 	@$(EXIT_ON_ERROR) \
 	for test in $(PYUNITS); do \
 	  $(PYTHON) $(srcdir)/tests/$$test ; \
 	done
 
 check-jar-mn::
 	make -C tests/src-simple check-jar
 	make -C tests/src-simple check-flat
+	make -C tests/src-simple check-flat USE_EXTENSION_MANIFEST=1
 ifneq ($(OS_ARCH), WINNT)
 	make -C tests/src-simple check-symlink
 endif
new file mode 100644
--- /dev/null
+++ b/config/tests/chrome.manifest.flat
@@ -0,0 +1,4 @@
+content test chrome/test/one xpcnativewrappers=no
+locale ab-X-stuff chrome/test/three
+overlay chrome://one/file.xml chrome://two/otherfile.xml
+skin test classic chrome/test/one
--- a/config/tests/src-simple/Makefile.in
+++ b/config/tests/src-simple/Makefile.in
@@ -47,21 +47,24 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/config.mk
 
 XPI_NAME = test_jar_mn
 
 DEFINES += \
 	-DAB_CD=ab-X-stuff \
 	$(NULL)
 
+MY_MANIFEST = $(if $(USE_EXTENSION_MANIFEST), $(FINAL_TARGET)/chrome.manifest, $(FINAL_TARGET)/chrome/test.manifest)
+REF_MANIFEST = $(if $(USE_EXTENSION_MANIFEST),chrome.manifest,test.manifest)
+
 check-%::
 	if test -d $(FINAL_TARGET); then rm -rf $(FINAL_TARGET); fi;
 	make realchrome MOZ_CHROME_FILE_FORMAT=$*
 	@echo "Comparing manifests..."
-	@if ! sort $(FINAL_TARGET)/chrome/test.manifest | diff -u $(srcdir)/../test.manifest.$* - ; then \
+	@if ! sort $(MY_MANIFEST) | diff -u $(srcdir)/../$(REF_MANIFEST).$* - ; then \
 	  echo "FAIL: different content in manifest!" ; \
 	fi
 	@if [ $* == "jar" ]; then \
 	  $(UNZIP) -d $(FINAL_TARGET)/chrome/test $(FINAL_TARGET)/chrome/test.jar; \
 	fi
 	@echo "Comparing packages..."
 	@if ! diff -ur $(srcdir)/../ref-simple $(FINAL_TARGET)/chrome/test ; then\
 	  echo "FAIL: different content in jar!" ; \