Bug 1342301 - Split out an "optimize" key from configure-args, r=arai

--HG--
extra : rebase_source : 4e6b682d848e1d6e0c081903efb89b982db693f8
This commit is contained in:
Steve Fink 2017-02-23 19:35:49 -08:00
parent 2330e0623c
commit ef3d545285
11 changed files with 30 additions and 11 deletions

View File

@ -46,6 +46,9 @@ parser.add_argument('--timeout', '-t', type=int, metavar='TIMEOUT',
parser.add_argument('--objdir', type=str, metavar='DIR',
default=env.get('OBJDIR', 'obj-spider'),
help='object directory')
parser.add_argument('--optimize', type=bool, metavar='OPT',
default=None,
help='whether to generate an optimized build. Overrides variant setting.')
parser.add_argument('--run-tests', '--tests', type=str, metavar='TESTSUITE',
default='',
help="comma-separated set of test suites to add to the variant's default set")
@ -133,9 +136,15 @@ POBJDIR = posixpath.join(PDIR.source, args.objdir)
AUTOMATION = env.get('AUTOMATION', False)
MAKE = env.get('MAKE', 'make')
MAKEFLAGS = env.get('MAKEFLAGS', '-j6')
CONFIGURE_ARGS = variant['configure-args']
UNAME_M = subprocess.check_output(['uname', '-m']).strip()
CONFIGURE_ARGS = variant['configure-args']
opt = args.optimize
if opt is None:
opt = variant.get('optimize')
if opt is not None:
CONFIGURE_ARGS += (" --enable-optimize" if opt else " --disable-optimize")
# Any jobs that wish to produce additional output can save them into the upload
# directory if there is such a thing, falling back to OBJDIR.
env.setdefault('MOZ_UPLOAD_DIR', OBJDIR)

View File

@ -1,4 +1,5 @@
{
"configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-pc-linux --host=i686-pc-linux",
"configure-args": "--enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-pc-linux --host=i686-pc-linux",
"optimize": true,
"bits": 32
}

View File

@ -1,4 +1,5 @@
{
"configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-apple-darwin10.0.0 --host=i686-apple-darwin10.0.0",
"configure-args": "--enable-debug --enable-stdcxx-compat --enable-simulator=arm --target=i686-apple-darwin10.0.0 --host=i686-apple-darwin10.0.0",
"optimize": true,
"bits": 32
}

View File

@ -1,5 +1,6 @@
{
"configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-simulator=arm64",
"configure-args": "--enable-debug --enable-stdcxx-compat --enable-simulator=arm64",
"optimize": true,
"env": {
"JSTESTS_EXTRA_ARGS": "--exclude-file={DIR}/arm64-jstests-slow.txt",
"JITTEST_EXTRA_ARGS": "--jitflags=none --args=--baseline-eager -x ion/ -x asm.js/"

View File

@ -1,5 +1,6 @@
{
"configure-args": "--disable-debug --enable-optimize --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-address-sanitizer",
"configure-args": "--disable-debug --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-address-sanitizer",
"optimize": true,
"compiler": "clang",
"env": {
"LLVM_SYMBOLIZER": "{TOOLTOOL_CHECKOUT}/clang/bin/llvm-symbolizer"

View File

@ -1,5 +1,6 @@
{
"configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-ctypes",
"configure-args": "--enable-debug --enable-stdcxx-compat --enable-ctypes",
"optimize": true,
"env": {
"JS_GC_ZEAL": "Compact",
"JITTEST_EXTRA_ARGS": "--jitflags=debug --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt",

View File

@ -1,3 +1,4 @@
{
"configure-args": "--enable-optimize --enable-debug --enable-dtrace --enable-debug-symbols"
"configure-args": "--enable-debug --enable-dtrace --enable-debug-symbols",
"optimize": true
}

View File

@ -1,5 +1,6 @@
{
"configure-args": "--disable-debug --enable-optimize --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-memory-sanitizer",
"configure-args": "--disable-debug --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-memory-sanitizer",
"optimize": true,
"compiler": "clang",
"env": {
"JITTEST_EXTRA_ARGS": "--jitflags=interp --ignore-timeouts={DIR}/cgc-jittest-timeouts.txt",

View File

@ -1,5 +1,6 @@
{
"configure-args": "--enable-optimize",
"configure-args": "",
"optimize": true,
"env": {
"JSTESTS_EXTRA_ARGS": "--jitflags=all"
}

View File

@ -1,5 +1,6 @@
{
"configure-args": "--enable-optimize --enable-debug --enable-stdcxx-compat --enable-ctypes",
"configure-args": "--enable-debug --enable-stdcxx-compat --enable-ctypes",
"optimize": true,
"env": {
"JS_GC_ZEAL": "GenerationalGC",
"JSTESTS_EXTRA_ARGS": "--jitflags=debug"

View File

@ -1,5 +1,6 @@
{
"configure-args": "--disable-debug --enable-optimize --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-thread-sanitizer",
"configure-args": "--disable-debug --enable-debug-symbols='-gline-tables-only' --disable-jemalloc --enable-thread-sanitizer",
"optimize": true,
"compiler": "clang",
"env": {
"LLVM_SYMBOLIZER": "{TOOLTOOL_CHECKOUT}/clang/bin/llvm-symbolizer",