bug 1201224 - stop unifying test package during mac universal builds. r=gps
authorTed Mielczarek <ted@mielczarek.org>
Wed, 02 Sep 2015 15:32:58 -0400
changeset 293958 f9097a2659c61cdf7c11ef4a35285d9f5776ba33
parent 293957 d56cd50e14618db3dac3a35d81003ec49eb6239e
child 293959 99df11976340725de1099413aec8ef9872f52547
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1201224
milestone43.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 1201224 - stop unifying test package during mac universal builds. r=gps
build/macosx/universal/flight.mk
build/macosx/universal/mozconfig
testing/mozharness/configs/builds/releng_base_mac_64_builds.py
testing/testsuite-targets.mk
--- a/build/macosx/universal/flight.mk
+++ b/build/macosx/universal/flight.mk
@@ -24,34 +24,8 @@ DIST = $(OBJDIR)/dist
 postflight_all:
 	mkdir -p $(DIST_UNI)/$(MOZ_PKG_APPNAME)
 	rm -f $(DIST_ARCH_2)/universal
 	ln -s $(abspath $(DIST_UNI)) $(DIST_ARCH_2)/universal
 # Stage a package for buildsymbols to be happy. Doing so in OBJDIR_ARCH_1
 # actually does a universal staging with both OBJDIR_ARCH_1 and OBJDIR_ARCH_2.
 	$(MAKE) -C $(OBJDIR_ARCH_1)/$(MOZ_BUILD_APP)/installer \
 	   PKG_SKIP_STRIP=1 stage-package
-ifdef ENABLE_TESTS
-# 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-stage
-# automation.py differs because it hardcodes a path to
-# dist/bin. It doesn't matter which one we use.
-	if test -d $(DIST_ARCH_1)/test-stage -a                 \
-                -d $(DIST_ARCH_2)/test-stage; then              \
-           cp $(DIST_ARCH_1)/test-stage/mochitest/automation.py \
-             $(DIST_ARCH_2)/test-stage/mochitest/;              \
-           cp -RL $(DIST_ARCH_1)/test-stage/mochitest/extensions/specialpowers \
-             $(DIST_ARCH_2)/test-stage/mochitest/extensions/;              \
-           cp $(DIST_ARCH_1)/test-stage/xpcshell/automation.py  \
-             $(DIST_ARCH_2)/test-stage/xpcshell/;               \
-           cp $(DIST_ARCH_1)/test-stage/reftest/automation.py   \
-             $(DIST_ARCH_2)/test-stage/reftest/;                \
-           cp -RL $(DIST_ARCH_1)/test-stage/reftest/specialpowers \
-             $(DIST_ARCH_2)/test-stage/reftest/;              \
-           $(TOPSRCDIR)/build/macosx/universal/unify                 \
-             --unify-with-sort "\.manifest$$" \
-             --unify-with-sort "all-test-dirs\.list$$"               \
-             $(DIST_ARCH_1)/test-stage                          \
-             $(DIST_ARCH_2)/test-stage                          \
-             $(DIST_UNI)/test-stage; fi
-endif
--- a/build/macosx/universal/mozconfig
+++ b/build/macosx/universal/mozconfig
@@ -1,11 +1,11 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 # i386/x86-64 Universal Build mozconfig
 
 # As used here, arguments in $MOZ_BUILD_PROJECTS are suitable as arguments
 # to gcc's -arch parameter.
-mk_add_options MOZ_BUILD_PROJECTS="i386 x86_64"
+mk_add_options MOZ_BUILD_PROJECTS="x86_64 i386"
 
 . $topsrcdir/build/macosx/universal/mozconfig.common
--- a/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
+++ b/testing/mozharness/configs/builds/releng_base_mac_64_builds.py
@@ -27,17 +27,17 @@ config = {
     },
     'app_ini_path': '%(obj_dir)s/dist/bin/application.ini',
     # decides whether we want to use moz_sign_cmd in env
     'enable_signing': True,
     'purge_skip': ['info', 'rel-*:10d', 'tb-rel-*:10d'],
     'purge_basedirs':  [],
     'enable_ccache': True,
     'vcs_share_base': '/builds/hg-shared',
-    'objdir': 'obj-firefox/i386',
+    'objdir': 'obj-firefox/x86_64',
     'tooltool_script': ["/builds/tooltool.py"],
     'tooltool_bootstrap': "setup.sh",
     'enable_count_ctors': False,
     'enable_talos_sendchange': True,
     'enable_unittest_sendchange': True,
     #########################################################################
 
 
--- a/testing/testsuite-targets.mk
+++ b/testing/testsuite-targets.mk
@@ -364,18 +364,18 @@ jetpack-tests:
 	cd $(topsrcdir)/addon-sdk/source && $(PYTHON) bin/cfx -b $(abspath $(browser_path)) --parseable testpkgs
 
 pgo-profile-run:
 	$(PYTHON) $(topsrcdir)/build/pgo/profileserver.py $(EXTRA_TEST_ARGS)
 
 # Package up the tests and test harnesses
 include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk
 
-ifndef UNIVERSAL_BINARY
 PKG_STAGE = $(DIST)/test-stage
+
 package-tests: \
   stage-config \
   stage-mach \
   stage-mochitest \
   stage-reftest \
   stage-xpcshell \
   stage-jstests \
   stage-jetpack \
@@ -388,59 +388,49 @@ package-tests: \
   stage-web-platform-tests \
   stage-luciddream \
   test-packages-manifest \
   test-packages-manifest-tc \
   $(NULL)
 ifdef MOZ_WEBRTC
 package-tests: stage-steeplechase
 endif
-else
-# This staging area has been built for us by universal/flight.mk
-PKG_STAGE = $(DIST)/universal/test-stage
-endif
 
 TEST_PKGS := \
   cppunittest \
   mochitest \
   reftest \
   xpcshell \
   web-platform \
   $(NULL)
 
 PKG_ARG = --$(1) '$(PKG_BASENAME).$(1).tests.zip'
 
 test-packages-manifest-tc:
 	@rm -f $(MOZ_TEST_PACKAGES_FILE_TC)
-ifndef UNIVERSAL_BINARY
 	$(NSINSTALL) -D $(dir $(MOZ_TEST_PACKAGES_FILE_TC))
-endif
 	$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py \
       --jsshell $(JSSHELL_NAME) \
       --dest-file $(MOZ_TEST_PACKAGES_FILE_TC) \
       --use-short-names \
       $(call PKG_ARG,common) \
       $(foreach pkg,$(TEST_PKGS),$(call PKG_ARG,$(pkg)))
 
 test-packages-manifest:
 	@rm -f $(MOZ_TEST_PACKAGES_FILE)
-ifndef UNIVERSAL_BINARY
 	$(NSINSTALL) -D $(dir $(MOZ_TEST_PACKAGES_FILE))
-endif
 	$(PYTHON) $(topsrcdir)/build/gen_test_packages_manifest.py \
       --jsshell $(JSSHELL_NAME) \
       --dest-file $(MOZ_TEST_PACKAGES_FILE) \
       $(call PKG_ARG,common) \
       $(foreach pkg,$(TEST_PKGS),$(call PKG_ARG,$(pkg)))
 
 package-tests:
 	@rm -f '$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)'
-ifndef UNIVERSAL_BINARY
 	$(NSINSTALL) -D $(DIST)/$(PKG_PATH)
-endif
 # Exclude harness specific directories when generating the common zip.
 	$(MKDIR) -p $(abspath $(DIST))/$(PKG_PATH) && \
 	cd $(PKG_STAGE) && \
 	  zip -rq9D '$(abspath $(DIST))/$(PKG_PATH)$(TEST_PACKAGE)' \
 	  * -x \*/.mkdir.done \*.pyc $(foreach name,$(TEST_PKGS),$(name)\*) && \
 	$(foreach name,$(TEST_PKGS),rm -f '$(DIST)/$(PKG_PATH)$(PKG_BASENAME).'$(name)'.tests.zip' && \
                                 zip -rq9D '$(abspath $(DIST))/$(PKG_PATH)$(PKG_BASENAME).'$(name)'.tests.zip' \
                                 $(name) -x \*/.mkdir.done \*.pyc ;)