Bug 1322323 - Consolidate common artifact build mozconfig options. r=chmanchester
authorRalph Giles <giles@mozilla.com>
Wed, 21 Dec 2016 15:44:48 -0800
changeset 374132 a9ba8e8f983a29761ff45eb431c25811810581e2
parent 374131 b81c89d068a7c4274ac430c7c96e24b1fe51f75b
child 374133 b2adce3404212ac0b7a8320023259138ccd9ae5f
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerschmanchester
bugs1322323, 1283898
milestone53.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 1322323 - Consolidate common artifact build mozconfig options. r=chmanchester Collect common options used in artifact build tests in a single mozconfig so they can be set more consistently. Use this to make unsetting toolchain defines universal in these tasks, fixing fallout from bug 1283898 which defined CARGO and RUSTC everywhere, conflicting with --disable-compiler-environment just like CC and CXX were conflicts in some artifact tasks. MozReview-Commit-ID: 4SbxByjClQb
browser/config/mozconfigs/linux32/artifact
browser/config/mozconfigs/linux32/debug-artifact
browser/config/mozconfigs/linux64/artifact
browser/config/mozconfigs/linux64/debug-artifact
browser/config/mozconfigs/macosx64/artifact
browser/config/mozconfigs/macosx64/debug-artifact
browser/config/mozconfigs/win32/artifact
browser/config/mozconfigs/win32/debug-artifact
browser/config/mozconfigs/win64/artifact
browser/config/mozconfigs/win64/debug-artifact
build/mozconfig.artifact
mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
mobile/android/config/mozconfigs/android-api-15/debug-artifact
mobile/android/config/mozconfigs/android-api-15/nightly-artifact
mobile/android/config/mozconfigs/android-x86/nightly-artifact
--- a/browser/config/mozconfigs/linux32/artifact
+++ b/browser/config/mozconfigs/linux32/artifact
@@ -1,12 +1,8 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/browser/config/mozconfigs/linux32/common-opt"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-unset RUSTC
-unset CARGO
--- a/browser/config/mozconfigs/linux32/debug-artifact
+++ b/browser/config/mozconfigs/linux32/debug-artifact
@@ -1,14 +1,10 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/unix/mozconfig.linux32"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-unset RUSTC
-unset CARGO
 
 ac_add_options --enable-debug
--- a/browser/config/mozconfigs/linux64/artifact
+++ b/browser/config/mozconfigs/linux64/artifact
@@ -1,12 +1,8 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/browser/config/mozconfigs/linux64/common-opt"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-unset RUSTC
-unset CARGO
--- a/browser/config/mozconfigs/linux64/debug-artifact
+++ b/browser/config/mozconfigs/linux64/debug-artifact
@@ -1,15 +1,11 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/unix/mozconfig.linux"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-unset RUSTC
-unset CARGO
 
 ac_add_options --enable-debug
 
--- a/browser/config/mozconfigs/macosx64/artifact
+++ b/browser/config/mozconfigs/macosx64/artifact
@@ -2,14 +2,10 @@ MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 # Needed to set SourceRepository in application.ini (used by Talos)
 export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/build/macosx/mozconfig.common"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-unset RUSTC
-unset CARGO
--- a/browser/config/mozconfigs/macosx64/debug-artifact
+++ b/browser/config/mozconfigs/macosx64/debug-artifact
@@ -1,14 +1,10 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/build/macosx/mozconfig.common"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
-unset CC
-unset CXX
-unset RUSTC
-unset CARGO
 
 ac_add_options --enable-debug
--- a/browser/config/mozconfigs/win32/artifact
+++ b/browser/config/mozconfigs/win32/artifact
@@ -4,10 +4,10 @@ MOZ_AUTOMATION_L10N_CHECK=0
 # Needed to set SourceRepository in application.ini (used by Talos)
 export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/win32/mozconfig.vs-latest"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
--- a/browser/config/mozconfigs/win32/debug-artifact
+++ b/browser/config/mozconfigs/win32/debug-artifact
@@ -1,12 +1,12 @@
 MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/win32/mozconfig.vs-latest"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
 
 ac_add_options --enable-debug
--- a/browser/config/mozconfigs/win64/artifact
+++ b/browser/config/mozconfigs/win64/artifact
@@ -5,10 +5,10 @@ MOZ_AUTOMATION_L10N_CHECK=0
 export MOZILLA_OFFICIAL=1
 
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/win64/mozconfig.vs-latest"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
--- a/browser/config/mozconfigs/win64/debug-artifact
+++ b/browser/config/mozconfigs/win64/debug-artifact
@@ -2,12 +2,12 @@ MOZ_AUTOMATION_BUILD_SYMBOLS=0
 MOZ_AUTOMATION_L10N_CHECK=0
 
 . "$topsrcdir/browser/config/mozconfigs/win64/common-win64"
 . "$topsrcdir/browser/config/mozconfigs/common"
 . "$topsrcdir/build/mozconfig.win-common"
 . "$topsrcdir/build/win64/mozconfig.vs-latest"
 . "$topsrcdir/build/mozconfig.common.override"
 
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 ac_add_options --enable-artifact-build-symbols
 
 ac_add_options --enable-debug
new file mode 100644
--- /dev/null
+++ b/build/mozconfig.artifact
@@ -0,0 +1,12 @@
+# Common options for testing artifact builds in automation.
+
+# Enable the artifact build.
+ac_add_options --enable-artifact-builds
+
+# Override any toolchain defines we've inherited from other mozconfigs.
+unset CC
+unset CXX
+unset HOST_CC
+unset HOST_CXX
+unset RUSTC
+unset CARGO
--- a/mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15-gradle/nightly-artifact
@@ -3,18 +3,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-api-15-gradle/nightly"
 
-unset CC
-unset CXX
-unset HOST_CC
-unset HOST_CXX
-unset RUSTC
-unset CARGO
-
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/debug-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15/debug-artifact
@@ -7,18 +7,11 @@ NO_NDK=1
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 # Global options
 ac_add_options --enable-debug
 ac_add_options --enable-marionette
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
 
-unset CC
-unset CXX
-unset HOST_CC
-unset HOST_CXX
-unset RUSTC
-unset CARGO
-
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-api-15/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-api-15/nightly-artifact
@@ -3,18 +3,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-api-15/nightly"
 
-unset CC
-unset CXX
-unset HOST_CC
-unset HOST_CXX
-unset RUSTC
-unset CARGO
-
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"
--- a/mobile/android/config/mozconfigs/android-x86/nightly-artifact
+++ b/mobile/android/config/mozconfigs/android-x86/nightly-artifact
@@ -3,18 +3,11 @@ MOZ_AUTOMATION_L10N_CHECK=0
 
 NO_CACHE=1
 NO_NDK=1
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/android-x86/nightly"
 
-unset CC
-unset CXX
-unset HOST_CC
-unset HOST_CXX
-unset RUSTC
-unset CARGO
-
-ac_add_options --enable-artifact-builds
+. "$topsrcdir/build/mozconfig.artifact"
 
 . "$topsrcdir/mobile/android/config/mozconfigs/common.override"