Bug 1084163 - Remove 'make check' from automation/build; r=glandium a=NPOTB
authorMike Shal <mshal@mozilla.com>
Thu, 23 Oct 2014 11:30:17 -0400
changeset 225992 5591e0a83c4d
parent 225991 8a6160e2ef98
child 225993 72d8ba95b2db
push id4099
push usermshal@mozilla.com
push date2014-11-07 15:57 +0000
treeherdermozilla-beta@dc18ad2b4816 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium, NPOTB
bugs1084163
milestone34.0
Bug 1084163 - Remove 'make check' from automation/build; r=glandium a=NPOTB 'make check' is somewhat special in that we want to trigger testers before it finishes. Since moving sendchange into mach is difficult and 'make check' may be going away in the future anyway, just pull it out for now. Also remove the MOZ_AUTOMATION_*_SENDCHANGE flags since we aren't using them.
browser/config/mozconfigs/linux32/debug
browser/config/mozconfigs/linux64/debug
browser/config/mozconfigs/linux64/debug-nonunified
browser/config/mozconfigs/linux64/debug-static-analysis-clang
browser/config/mozconfigs/linux64/nightly-nonunified
browser/config/mozconfigs/macosx-universal/nightly-nonunified
browser/config/mozconfigs/macosx64/debug
browser/config/mozconfigs/macosx64/debug-nonunified
browser/config/mozconfigs/win32/debug
browser/config/mozconfigs/win32/debug-nonunified
browser/config/mozconfigs/win32/nightly-nonunified
browser/config/mozconfigs/win64/debug
build/moz-automation.mk
build/mozconfig.automation
build/unix/mozconfig.asan
--- a/browser/config/mozconfigs/linux32/debug
+++ b/browser/config/mozconfigs/linux32/debug
@@ -1,15 +1,14 @@
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-signmar
 
 ac_add_options --disable-unified-compilation
 
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/unix/mozconfig.linux32
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 #Use ccache
--- a/browser/config/mozconfigs/linux64/debug
+++ b/browser/config/mozconfigs/linux64/debug
@@ -1,13 +1,12 @@
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-signmar
 
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . $topsrcdir/build/unix/mozconfig.linux
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Use ccache
--- a/browser/config/mozconfigs/linux64/debug-nonunified
+++ b/browser/config/mozconfigs/linux64/debug-nonunified
@@ -1,7 +1,5 @@
 MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_CHECK=0
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/debug"
 
 ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/linux64/debug-static-analysis-clang
+++ b/browser/config/mozconfigs/linux64/debug-static-analysis-clang
@@ -1,14 +1,11 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_PACKAGE_TESTS=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_CHECK=0
 
 . "$topsrcdir/build/mozconfig.common"
 
 ac_add_options --enable-debug
 
 ac_add_options --disable-unified-compilation
 
 # Use Clang as specified in manifest
--- a/browser/config/mozconfigs/linux64/nightly-nonunified
+++ b/browser/config/mozconfigs/linux64/nightly-nonunified
@@ -1,9 +1,6 @@
 MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
-MOZ_AUTOMATION_CHECK=0
 MOZ_AUTOMATION_PRETTY=1
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/nightly"
 
 ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/macosx-universal/nightly-nonunified
+++ b/browser/config/mozconfigs/macosx-universal/nightly-nonunified
@@ -1,8 +1,5 @@
 MOZ_AUTOMATION_PRETTY=1
 MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
-MOZ_AUTOMATION_CHECK=0
 . "$topsrcdir/browser/config/mozconfigs/macosx-universal/nightly"
 
 ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/macosx64/debug
+++ b/browser/config/mozconfigs/macosx64/debug
@@ -1,9 +1,8 @@
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 . $topsrcdir/build/macosx/mozconfig.common
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-accessibility
 ac_add_options --enable-signmar
 
 # Needed to enable breakpad in application.ini
--- a/browser/config/mozconfigs/macosx64/debug-nonunified
+++ b/browser/config/mozconfigs/macosx64/debug-nonunified
@@ -1,7 +1,4 @@
 MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
-MOZ_AUTOMATION_CHECK=0
 . "$topsrcdir/browser/config/mozconfigs/macosx64/debug"
 
 ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/win32/debug
+++ b/browser/config/mozconfigs/win32/debug
@@ -1,11 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
 ac_add_options --enable-signmar
 ac_add_options --enable-require-all-d3dc-versions
 
--- a/browser/config/mozconfigs/win32/debug-nonunified
+++ b/browser/config/mozconfigs/win32/debug-nonunified
@@ -1,9 +1,6 @@
 . "$topsrcdir/build/mozconfig.win-common"
-MOZ_AUTOMATION_CHECK=0
 MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
 MOZ_AUTOMATION_UPLOAD=0
 . "$topsrcdir/browser/config/mozconfigs/win32/debug"
 
 ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/win32/nightly-nonunified
+++ b/browser/config/mozconfigs/win32/nightly-nonunified
@@ -1,9 +1,6 @@
 . "$topsrcdir/build/mozconfig.win-common"
 MOZ_AUTOMATION_PRETTY=1
 MOZ_AUTOMATION_UPLOAD=0
-MOZ_AUTOMATION_UNITTEST_SENDCHANGE=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
-MOZ_AUTOMATION_CHECK=0
 . "$topsrcdir/browser/config/mozconfigs/win32/nightly"
 
 ac_add_options --disable-unified-compilation
--- a/browser/config/mozconfigs/win64/debug
+++ b/browser/config/mozconfigs/win64/debug
@@ -1,11 +1,10 @@
 . "$topsrcdir/build/mozconfig.win-common"
 MOZ_AUTOMATION_L10N_CHECK=0
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 . "$topsrcdir/browser/config/mozconfigs/common"
 
 ac_add_options --target=x86_64-pc-mingw32
 ac_add_options --host=x86_64-pc-mingw32
 
 ac_add_options --enable-debug
 ac_add_options --enable-dmd
 ac_add_options --enable-profiling  # needed for --enable-dmd to work on Windows
--- a/build/moz-automation.mk
+++ b/build/moz-automation.mk
@@ -15,17 +15,16 @@ include $(topsrcdir)/toolkit/mozapps/ins
 
 # Log file from the 'make upload' step. We need this to parse out the URLs of
 # the uploaded files.
 AUTOMATION_UPLOAD_OUTPUT = $(DIST)/automation-upload.txt
 
 # Helper variables to convert from MOZ_AUTOMATION_* variables to the
 # corresponding the make target
 tier_BUILD_SYMBOLS = buildsymbols
-tier_CHECK = check
 tier_L10N_CHECK = l10n-check
 tier_PRETTY_L10N_CHECK = pretty-l10n-check
 tier_INSTALLER = installer
 tier_PRETTY_INSTALLER = pretty-installer
 tier_PACKAGE = package
 tier_PRETTY_PACKAGE = pretty-package
 tier_PACKAGE_TESTS = package-tests
 tier_PRETTY_PACKAGE_TESTS = pretty-package-tests
@@ -44,17 +43,16 @@ moz_automation_symbols = \
   BUILD_SYMBOLS \
   UPLOAD_SYMBOLS \
   PACKAGE \
   PRETTY_PACKAGE \
   INSTALLER \
   PRETTY_INSTALLER \
   UPDATE_PACKAGING \
   PRETTY_UPDATE_PACKAGING \
-  CHECK \
   L10N_CHECK \
   PRETTY_L10N_CHECK \
   UPLOAD \
   $(NULL)
 MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$(MOZ_AUTOMATION_$(sym))),$(tier_$(sym))))
 
 # Dependencies between automation build steps
 automation/uploadsymbols: automation/buildsymbols
@@ -69,36 +67,32 @@ automation/pretty-l10n-check: automation
 automation/pretty-l10n-check: automation/pretty-installer
 
 automation/upload: automation/installer
 automation/upload: automation/package
 automation/upload: automation/package-tests
 automation/upload: automation/buildsymbols
 automation/upload: automation/update-packaging
 
-# automation/{pretty-}package and automation/check should depend on build (which is
-# implicit due to the way client.mk invokes automation/build), but buildsymbols
-# changes the binaries/libs, and that's what we package/test.
+# automation/{pretty-}package should depend on build (which is implicit due to
+# the way client.mk invokes automation/build), but buildsymbols changes the
+# binaries/libs, and that's what we package/test.
 automation/pretty-package: automation/buildsymbols
-automation/check: automation/buildsymbols
 
 # The 'pretty' versions of targets run before the regular ones to avoid
 # conflicts in writing to the same files.
 automation/installer: automation/pretty-installer
 automation/package: automation/pretty-package
 automation/package-tests: automation/pretty-package-tests
 automation/l10n-check: automation/pretty-l10n-check
 automation/update-packaging: automation/pretty-update-packaging
 
 automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS))
 	$(PYTHON) $(topsrcdir)/build/gen_mach_buildprops.py --complete-mar-file $(DIST)/$(COMPLETE_MAR) --upload-output $(AUTOMATION_UPLOAD_OUTPUT)
 
-# make check runs with the keep-going flag so we can see all the failures
-AUTOMATION_EXTRA_CMDLINE-check = -k
-
 # We need the log from make upload to grep it for urls in order to set
 # properties.
 AUTOMATION_EXTRA_CMDLINE-upload = 2>&1 | tee $(AUTOMATION_UPLOAD_OUTPUT)
 
 # Note: We have to force -j1 here, at least until bug 1036563 is fixed.
 AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1
 AUTOMATION_EXTRA_CMDLINE-pretty-l10n-check = -j1
 
--- a/build/mozconfig.automation
+++ b/build/mozconfig.automation
@@ -5,23 +5,20 @@
 # Common mozconfig for automation builds.
 #
 # We export MOZ_AUTOMATION_* variables here to trigger various steps in
 # automation builds.  For example, if MOZ_AUTOMATION_PACKAGE is set, then the
 # package step will run.  This file contains the default settings, which can be
 # overridden by setting them earlier in the appropriate mozconfig.
 
 mk_add_options "export MOZ_AUTOMATION_BUILD_SYMBOLS=${MOZ_AUTOMATION_BUILD_SYMBOLS-1}"
-mk_add_options "export MOZ_AUTOMATION_CHECK=${MOZ_AUTOMATION_CHECK-1}"
 mk_add_options "export MOZ_AUTOMATION_L10N_CHECK=${MOZ_AUTOMATION_L10N_CHECK-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
 mk_add_options "export MOZ_AUTOMATION_PACKAGE_TESTS=${MOZ_AUTOMATION_PACKAGE_TESTS-1}"
 mk_add_options "export MOZ_AUTOMATION_INSTALLER=${MOZ_AUTOMATION_INSTALLER-0}"
-mk_add_options "export MOZ_AUTOMATION_TALOS_SENDCHANGE=${MOZ_AUTOMATION_TALOS_SENDCHANGE-1}"
-mk_add_options "export MOZ_AUTOMATION_UNITTEST_SENDCHANGE=${MOZ_AUTOMATION_UNITTEST_SENDCHANGE-1}"
 mk_add_options "export MOZ_AUTOMATION_UPDATE_PACKAGING=${MOZ_AUTOMATION_UPDATE_PACKAGING-0}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD=${MOZ_AUTOMATION_UPLOAD-1}"
 mk_add_options "export MOZ_AUTOMATION_UPLOAD_SYMBOLS=${MOZ_AUTOMATION_UPLOAD_SYMBOLS-0}"
 
 # If we are also building with MOZ_PKG_PRETTYNAMES, set the corresponding
 # stages.
 if test "$MOZ_AUTOMATION_PRETTY" = "1"; then
     mk_add_options "export MOZ_AUTOMATION_PRETTY_PACKAGE=${MOZ_AUTOMATION_PACKAGE-1}"
--- a/build/unix/mozconfig.asan
+++ b/build/unix/mozconfig.asan
@@ -1,9 +1,8 @@
-MOZ_AUTOMATION_TALOS_SENDCHANGE=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/mozconfig.common"
 
 # Use Clang as specified in manifest
 export CC="$topsrcdir/clang/bin/clang -fgnu89-inline"
 export CXX="$topsrcdir/clang/bin/clang++"
 export LLVM_SYMBOLIZER="$topsrcdir/clang/bin/llvm-symbolizer"