Bug 601471 - Unify: stop trying to 'package-tests' builds with '--disable-tests'. rs=Callek over irc
authorMark Banner <bugzilla@standard8.plus.com>
Thu, 04 Nov 2010 19:14:14 +0000
changeset 6655 67033a790980e896d2f6a599b24d2d20c50eb0a3
parent 6654 08b1cbc4540d4b85637d05dca97d21af855335e5
child 6656 6ea0e2c0f1ed6b1ff1a85ac956e7cce4f4ba2723
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs601471
Bug 601471 - Unify: stop trying to 'package-tests' builds with '--disable-tests'. rs=Callek over irc
build/macosx/universal/flight.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -119,16 +119,17 @@ endif
 ifdef MOZ_CALENDAR
 ifndef DISABLE_LIGHTNING_INSTALL
 ifndef MOZ_SUNBIRD
 	rm $(DIST_ARCH_1)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf \
 	   $(DIST_ARCH_2)/$(MOZ_PKG_APPNAME)/$(APPNAME)/Contents/MacOS/extensions/\{e2fda1a4-762b-4020-b5ad-a41df1933103\}/install.rdf
 endif
 endif
 endif
+ifdef ENABLE_TESTS
 # A universal .dmg can now be produced by making in either architecture's
 # INSTALLER_DIR.
 # Now, repeat the process for the test package.
 	$(MAKE) -C $(OBJDIR_ARCH_1) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	$(MAKE) -C $(OBJDIR_ARCH_2) UNIVERSAL_BINARY= CHROME_JAR= package-tests
 	rm -rf $(DIST_UNI)/test-package-stage
 # automation.py differs because it hardcodes a path to
 # dist/bin. It doesn't matter which one we use.
@@ -143,8 +144,9 @@ endif
                $(DIST_ARCH_2)/test-package-stage/mozmill/;              \
            fi; \
 	  $(TOPSRCDIR)/mozilla/build/macosx/universal/unify \
 	      --unify-with-sort "all-test-dirs\.list$$" \
 	      $(DIST_ARCH_1)/test-package-stage                         \
 	      $(DIST_ARCH_2)/test-package-stage                         \
 	      $(DIST_UNI)/test-package-stage; \
 	fi
+endif