commit 20602b7bdafb7870c312370dc85c6a2cb0c6d61b
author Rico Wind <ricow@google.com> Wed Jan 09 09:17:13 2019 +0100
committer Rico Wind <ricow@google.com> Wed Jan 09 08:18:30 2019 +0000
tree 7215e90275b79dc75115a88ad45e2b08b5331428
parent adb91d9cdbb4c8a5d4b1e964b5c4575f453d4260

Allow -Xmx to be passed as extra args to run_on_app

Currently we overwrite the value unconditionally (jvm seems to just take the biggest)

Bug: 121018500

Change-Id: Idb10b72d7020838c2d0e913ae70bc1f063d98a64

tools/run_on_app.py

diff --git a/tools/run_on_app.py b/tools/run_on_app.py
index 31cecfc..b23c173 100755
--- a/tools/run_on_app.py
+++ b/tools/run_on_app.py
@@ -211,7 +211,8 @@
 def run_with_options(options, args, extra_args=[]):
   app_provided_pg_conf = False;
   # todo(121018500): remove when memory is under control
-  extra_args.append('-Xmx8G')
+  if not any('-Xmx' in arg for arg in extra_args):
+    extra_args.append('-Xmx8G')
   if options.golem:
     golem.link_third_party()
     options.out = os.getcwd()