Skip to content

Commit

Permalink
bug 1198190 - Support cross-debug as a build variant, copy 64_debug m…
Browse files Browse the repository at this point in the history
…ac sub-config to 64_cross_debug, disable check tests on mac-cross. r=jlund

--HG--
rename : testing/mozharness/configs/builds/releng_sub_mac_configs/64_debug.py => testing/mozharness/configs/builds/releng_sub_mac_configs/64_cross_debug.py
extra : commitid : 6zTooQgHX7d
extra : rebase_source : 6665d9577a6fb4069e34c184f154097f260dc960
  • Loading branch information
luser committed Aug 24, 2015
1 parent 8ec6ece commit f158d41
Show file tree
Hide file tree
Showing 3 changed files with 46 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import os

MOZ_OBJDIR = 'obj-firefox'

config = {
'default_actions': [
'clobber',
'clone-tools',
'checkout-sources',
# 'setup-mock',
'build',
'upload-files',
'sendchange',
# 'generate-build-stats',
'update', # decided by query_is_nightly()
],
'stage_platform': 'macosx64-debug',
'debug_build': True,
'objdir': 'obj-firefox',
'enable_talos_sendchange': False,
#### 64 bit build specific #####
'env': {
'MOZBUILD_STATE_PATH': os.path.join(os.getcwd(), '.mozbuild'),
'MOZ_AUTOMATION': '1',
'HG_SHARE_BASE_DIR': '/builds/hg-shared',
'MOZ_OBJDIR': 'obj-firefox',
'TINDERBOX_OUTPUT': '1',
'TOOLTOOL_CACHE': '/builds/tooltool_cache',
'TOOLTOOL_HOME': '/builds',
'MOZ_CRASHREPORTER_NO_REPORT': '1',
'CCACHE_DIR': '/builds/ccache',
'CCACHE_COMPRESS': '1',
'CCACHE_UMASK': '002',
'LC_ALL': 'C',
'XPCOM_DEBUG_BREAK': 'stack-and-abort',
## 64 bit specific
'PATH': '/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:'
'/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin',
##
},
'src_mozconfig': 'browser/config/mozconfigs/macosx64/debug',
'purge_minsize': 10,
#######################
}
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@ class BuildOptionParser(object):
'asan': 'builds/releng_sub_%s_configs/%s_asan.py',
'tsan': 'builds/releng_sub_%s_configs/%s_tsan.py',
'b2g-debug': 'b2g/releng_sub_%s_configs/%s_debug.py',
'cross-debug': 'builds/releng_sub_%s_configs/%s_cross_debug.py',
'debug': 'builds/releng_sub_%s_configs/%s_debug.py',
'asan-and-debug': 'builds/releng_sub_%s_configs/%s_asan_and_debug.py',
'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
Expand Down
2 changes: 1 addition & 1 deletion testing/taskcluster/tasks/builds/dbg_macosx64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ task:

payload:
env:
MH_CUSTOM_BUILD_VARIANT_CFG: 'debug'
MH_CUSTOM_BUILD_VARIANT_CFG: 'cross-debug'
extra:
treeherder:
groupSymbol: tc
Expand Down

0 comments on commit f158d41

Please sign in to comment.