commit ca3f28281808440dfc439eb7c90434dd0cc98a61
author Tamas Kenez <tamaskenez@google.com> Wed Aug 16 16:06:01 2017 +0200
committer Tamas Kenez <tamaskenez@google.com> Wed Aug 16 16:06:01 2017 +0200
tree 8dc7ee0f1cbf5d259794465519b79637e50450d0
parent 1759f208223a212a54740702376f4df5c2cff559

Framework.jar testing: give DX more heap -Xmx1600

Bug:
Change-Id: I1783a34ca21d7db31153ca073effe125ec01b98d

tools/test_framework.py

diff --git a/tools/test_framework.py b/tools/test_framework.py
index 139b9c9..9e5f63f 100755
--- a/tools/test_framework.py
+++ b/tools/test_framework.py
@@ -69,6 +69,7 @@
       tool_args = ['--dex', '--output=' + temp_dir, '--multi-dex',
           '--min-sdk-version=' + MIN_SDK_VERSION]
 
+    xmx = None
     if args.tool.startswith('goyt'):
       tool_file = GOYT_EXE
       tool_args = ['--num-threads=8'] + tool_args
@@ -76,12 +77,13 @@
         tool_args.append('--no-locals')
     elif args.tool == 'dx':
       tool_file = DX_JAR
+      xmx = '-Xmx1600m'
     else:
       tool_file = D8_JAR
       tool_args = ['--output', temp_dir, '--min-api', MIN_SDK_VERSION]
       if args.tool == 'd8-release':
         tool_args.append('--release')
-
+      xmx = '-Xmx600m'
 
     cmd = []
 
@@ -91,7 +93,8 @@
       cmd.extend(['tools/track_memory.sh', track_memory_file])
 
     if tool_file.endswith('.jar'):
-      cmd.extend(['java', '-Xmx600m', '-jar'])
+      assert xmx is not None
+      cmd.extend(['java', xmx, '-jar'])
 
     cmd.extend([tool_file] + tool_args + [FRAMEWORK_JAR])